Skip to content
Snippets Groups Projects
Commit 2f0afc11 authored by Mark Beierl's avatar Mark Beierl
Browse files

Snap promotion fix


Changes snapcraft to run directly on host instead of in docker
continer.  This adds the requirement to have snapcraft installed
in the Jenkins agent, but is more reliable as the snapcraft docker
image is not the best practice anymore for building snaps.

Change-Id: I78a9d12d1c6e054f0fe886ccfe08472309100d0f
Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>
parent 958cf65b
No related branches found
No related tags found
No related merge requests found
......@@ -518,9 +518,9 @@ EOF"""
stage("Snap promotion") {
def snaps = ["osmclient"]
sh "snapcraft login --with ~/.snapcraft/config"
for (snap in snaps) {
sh "docker pull snapcore/snapcraft:stable"
channel=""
channel="latest/"
if (BRANCH_NAME.startsWith("v")) {
channel=BRANCH_NAME.substring(1)+"/"
} else if (BRANCH_NAME!="master") {
......@@ -528,26 +528,19 @@ EOF"""
}
track=channel+"edge\\*"
edge_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()
script: "snapcraft revisions $snap | " +
"grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
print "edge rev is $edge_rev"
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()
script: "snapcraft revisions $snap | " +
"grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
print "beta rev is $beta_rev"
if ( edge_rev != beta_rev ) {
print "Promoting $edge_rev to beta in place of $beta_rev"
beta_track=channel+"beta"
sh("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 release $snap $edge_rev $beta_track\"")
sh "snapcraft release $snap $edge_rev $beta_track"
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment