def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifactory_server,docker_args="",do_stage_4=false) {
println("do_stage_3= ${do_stage_3}")
ci_helper = load "devops/jenkins/ci-pipelines/ci_helper.groovy"
+ def isMergeJob = JOB_NAME.contains('merge')
stage('Prepare') {
sh 'env'
}
stage('License Scan') {
- if (!JOB_NAME.contains('merge')) {
+ if (!isMergeJob) {
sh "devops/tools/license_scan.sh"
}
else {
stage('Release Note Check') {
if (fileExists('devops-stages/stage-releasenote.sh')) {
- if (!JOB_NAME.contains('merge')) {
+ if (!isMergeJob) {
sh "devops-stages/stage-releasenote.sh"
}
else {
sh "sudo rm -rf ${WORKSPACE}/stage/ ${WORKSPACE}/parts/ ${WORKSPACE}/prime/"
REV=""
- if ( !JOB_NAME.contains('merge') ) {
+ if ( ! isMergeJob ) {
REV="/"+"${GERRIT_REFSPEC}".replaceAll('/','-')
}
channel="latest"
'installers/charm/bundles/osm',
'installers/charm/bundles/osm-ha',
'installers/charm/grafana',
- 'installers/charm/juju-simplestreams-operator',
- 'installers/charm/kafka-exporter',
- 'installers/charm/mariadb-k8s',
'installers/charm/mongodb-exporter',
'installers/charm/mysqld-exporter',
'installers/charm/osm-lcm',
concurrency = sh(returnStdout: true, script: "expr `nproc` / 2").trim() as int
for (charmPath in charms) {
def directory = charmPath
- CHECK_CHANGES = "git diff --name-only origin/$GERRIT_BRANCH -- $directory |wc -l"
- charmsChanged = sh(returnStdout:true, script: CHECK_CHANGES).trim()
- if (charmsChanged != "0") {
- println("$directory has changes, rebuilding")
-
- parallelSteps[directory] = {
- waitUntil(quiet: true, initialRecurrencePeriod: 5) {
- if (concurrency > 0) {
- concurrency--
- true
- } else {
- sleep 5
- false
- }
- }
- try {
- dir("${directory}") {
- try {
- sh "charmcraft pack --format json --verbosity brief 1> pack.json 2> pack-stderr.log"
- } catch (Exception e) {
- sh "cat pack-stderr.log"
- throw e
- }
+ if (fileExists("$charmPath/charmcraft.yaml")) {
+ CHECK_CHANGES = "git diff --name-only origin/$GERRIT_BRANCH -- $directory |wc -l"
+ charmsChanged = sh(returnStdout:true, script: CHECK_CHANGES).trim()
+ if (charmsChanged != "0" || isMergeJob) {
+ println("$directory has changes, rebuilding")
- def resourceName = sh(
- returnStdout: true,
- script: 'cat pack.json | jq -r ".charms[0], .bundles[0]" | grep -v null').trim()
-
- withCredentials([string(credentialsId: 'Charmstore', variable: 'CHARMCRAFT_AUTH')]) {
- commandOutput = sh(returnStdout:true, script: "charmcraft whoami")
+ parallelSteps[directory] = {
+ waitUntil(quiet: true, initialRecurrencePeriod: 5) {
+ if (concurrency > 0) {
+ concurrency--
+ true
+ } else {
+ sleep 5
+ false
+ }
+ }
+ try {
+ dir("${directory}") {
try {
- println("Uploading $resourceName")
- sh "charmcraft upload --format json --verbosity brief $resourceName 1> upload.json 2> upload-stderr.log"
+ sh "charmcraft pack --format json --verbosity brief 1> pack.json 2> pack-stderr.log"
} catch (Exception e) {
- sh "cat upload-stderr.log"
+ sh "cat pack-stderr.log"
throw e
}
- def charmRevision = sh(
+
+ def charmFilename = sh(
returnStdout: true,
- script: 'cat upload.json | jq -r ".revision"').trim()
+ script: 'cat pack.json | jq -r ".charms[0], .bundles[0]" | grep -v null').trim()
- def charmBranch="merged"
- if ( !JOB_NAME.contains('merge') ) {
- charmBranch="${GERRIT_REFSPEC}".replaceAll('/','-')
- }
- def channel="latest"
- if (BRANCH_NAME.startsWith("v")) {
- channel=BRANCH_NAME.substring(1)
- } else if (BRANCH_NAME!="master") {
- REV="/"+BRANCH_NAME+REV.replaceAll('/','-')
- }
+ withCredentials([string(credentialsId: 'Charmstore', variable: 'CHARMCRAFT_AUTH')]) {
+ try {
+ println("Uploading $charmFilename")
+ sh "charmcraft upload --format json --verbosity brief $charmFilename 1> upload.json 2> upload-stderr.log"
+ } catch (Exception e) {
+ def errorMessage = sh(
+ returnStdout: true,
+ script: 'cat upload.json | jq -r ".errors[0].message" | grep -v null').trim()
+ if (errorMessage.contains("already exists")) {
+ println("No changes, skipping upload")
+ return 0
+ }
+ sh "cat upload-stderr.log"
+ throw e
+ }
+ def charmRevision = sh(
+ returnStdout: true,
+ script: 'cat upload.json | jq -r ".revision"').trim()
- def charmName = sh(
- returnStdout:true,
- script: "if [ -f bundle.yaml ];then cat bundle.yaml;else cat metadata.yaml;fi|yq -r .name").trim()
- sh "charmcraft release ${charmName} --revision=${charmRevision} --channel=${channel}/edge/${charmBranch}"
+ def charmBranch="merged"
+ if ( !JOB_NAME.contains('merge') ) {
+ charmBranch="${GERRIT_REFSPEC}".replaceAll('/','-')
+ }
+ def channel="latest"
+ if (BRANCH_NAME.startsWith("v")) {
+ channel=BRANCH_NAME.substring(1)
+ } else if (BRANCH_NAME!="master") {
+ REV="/"+BRANCH_NAME+REV.replaceAll('/','-')
+ }
+
+ def charmName = sh(
+ returnStdout:true,
+ script: "if [ -f bundle.yaml ];then cat bundle.yaml;else cat metadata.yaml;fi|yq -r .name").trim()
+
+ def resourceArgument = ""
+ try {
+ def resourceName = sh(
+ returnStdout:true,
+ script: "cat metadata.yaml | yq '.resources | keys | .[0]'").trim()
+
+ resourceArgument = "--resource $resourceName:1"
+
+ resourceName = sh(
+ returnStdout:true,
+ script: "cat metadata.yaml | yq '.resources | keys | .[1]'").trim()
+ if( resourceName != "null" ) {
+ resourceArgument += " --resource $resourceName:1"
+ }
+
+ } catch (Exception discard) {
+ print("No resource associated with bundle, skipping")
+ }
+
+ print("resourceArgument = $resourceArgument")
+
+ sh "charmcraft release ${charmName} --revision=${charmRevision} ${resourceArgument} --channel=${channel}/edge/${charmBranch}"
+ }
}
+ } finally {
+ concurrency++
}
- } finally {
- concurrency++
}
}
}