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>
REV=""
if ( !JOB_NAME.contains('merge') ) {
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")) {
}
channel="latest"
if (BRANCH_NAME.startsWith("v")) {
"-w /build snapcore/snapcraft:stable /bin/bash -c " +
"\"snapcraft login --with /snapcraft/config &>/dev/null && " +
"snapcraft revisions $snap\" | " +
"-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\" | " +
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"
if ( edge_rev != beta_rev ) {
print "Promoting $edge_rev to beta in place of $beta_rev"