From: beierlm <mark.beierl@canonical.com>
Date: Fri, 18 Dec 2020 12:30:48 +0000 (-0500)
Subject: Use Ref as Revision
X-Git-Tag: v9.0.0^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F10145%2F3;p=osm%2Fdevops.git

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 <mark.beierl@canonical.com>
---

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"