From 7498c1dfab5ba2a01a532ab8069abbceae5ccd08 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 18 Dec 2020 07:30:48 -0500 Subject: [PATCH] Use Ref as Revision Change to use the short ref for the proposed revision instead of Gerrit Ref Spec. This allows the job to succeed even if there is no refspec, such as when a new branch is created. Change-Id: Icec5615f8e01f33507dc87765a240a3de2489e09 Signed-off-by: beierlm --- jenkins/ci-pipelines/ci_stage_2.groovy | 4 +++- jenkins/ci-pipelines/ci_stage_3.groovy | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index 049763c6..616f569f 100644 --- a/jenkins/ci-pipelines/ci_stage_2.groovy +++ b/jenkins/ci-pipelines/ci_stage_2.groovy @@ -88,7 +88,9 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa REV="" if ( !JOB_NAME.contains('merge') ) { - REV="/"+"${GERRIT_REFSPEC}".replaceAll('/','-') + short_ref=sh(returnStdout: true, + script: "git rev-parse --short HEAD").trim() + REV="/"+short_ref } channel="latest" if (BRANCH_NAME.startsWith("v")) { diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 541213b4..de2aaacd 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -531,14 +531,14 @@ EOF""" "-w /build snapcore/snapcraft:stable /bin/bash -c " + "\"snapcraft login --with /snapcraft/config &>/dev/null && " + "snapcraft revisions $snap\" | " + - "grep \" $track\" | tail -1 | awk '{print \$1}'").trim() + "grep \"$track\" | tail -1 | awk '{print \$1}'").trim() track=channel+"beta\\*" beta_rev=sh(returnStdout: true, script: "sudo docker run -v ~/.snapcraft:/snapcraft -v ${WORKSPACE}:/build " + "-w /build snapcore/snapcraft:stable /bin/bash -c " + "\"snapcraft login --with /snapcraft/config &>/dev/null && " + "snapcraft revisions $snap\" | " + - "grep \" $track\" | tail -1 | awk '{print \$1}'").trim() + "grep \"$track\" | tail -1 | awk '{print \$1}'").trim() if ( edge_rev != beta_rev ) { print "Promoting $edge_rev to beta in place of $beta_rev" -- 2.17.1