projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes Bug 1429: Add a different way to install nodejs
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_stage_3.groovy
diff --git
a/jenkins/ci-pipelines/ci_stage_3.groovy
b/jenkins/ci-pipelines/ci_stage_3.groovy
index
de2aaac
..
4ba5630
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_3.groovy
@@
-518,8
+518,9
@@
EOF"""
stage("Snap promotion") {
def snaps = ["osmclient"]
stage("Snap promotion") {
def snaps = ["osmclient"]
+ sh "snapcraft login --with ~/.snapcraft/config"
for (snap in snaps) {
for (snap in snaps) {
- channel=""
+ channel="
latest/
"
if (BRANCH_NAME.startsWith("v")) {
channel=BRANCH_NAME.substring(1)+"/"
} else if (BRANCH_NAME!="master") {
if (BRANCH_NAME.startsWith("v")) {
channel=BRANCH_NAME.substring(1)+"/"
} else if (BRANCH_NAME!="master") {
@@
-527,26
+528,19
@@
EOF"""
}
track=channel+"edge\\*"
edge_rev=sh(returnStdout: true,
}
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\" | " +
+ script: "snapcraft revisions $snap | " +
"grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
"grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
+ print "edge rev is $edge_rev"
track=channel+"beta\\*"
beta_rev=sh(returnStdout: true,
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\" | " +
+ script: "snapcraft revisions $snap | " +
"grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
"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"
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"
}
}
}
}
}
}