X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=6722e47b74bc094a6a42d67f934f1c491ec3fe3e;hb=fd97f814dcd29f877db7f7f689bfc0b551d37e12;hp=73842e3797348e5e573d9a747d176c736f6670eb;hpb=ae8fa3de4426fd600e37c734644f89ccaa9d5715;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index 73842e37..6722e47b 100644 --- a/jenkins/ci-pipelines/ci_stage_2.groovy +++ b/jenkins/ci-pipelines/ci_stage_2.groovy @@ -52,7 +52,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa stage('Release Note Check') { if (fileExists('devops-stages/stage-releasenote.sh')) { - if (!sMergeJob) { + if (!isMergeJob) { sh "devops-stages/stage-releasenote.sh" } else { @@ -131,9 +131,6 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa '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', @@ -142,6 +139,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa 'installers/charm/osm-ng-ui', 'installers/charm/osm-pol', 'installers/charm/osm-ro', + 'installers/charm/osm-update-db-operator', 'installers/charm/prometheus', 'installers/charm/vca-integrator-operator', ] @@ -149,73 +147,114 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa 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" || isMergeJob) { - 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 --force --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")) { + if (isMergeJob) { + CHECK_CHANGES = "git diff --name-only HEAD^1 -- $directory |wc -l" + } else { + CHECK_CHANGES = "git diff --name-only origin/$GERRIT_BRANCH -- $directory |wc -l" + } + charmsChanged = sh(returnStdout:true, script: CHECK_CHANGES).trim() - def resourceName = sh( - returnStdout: true, - script: 'cat pack.json | jq -r ".charms[0], .bundles[0]" | grep -v null').trim() + if (charmsChanged != "0") { + println("$directory has changes, rebuilding") - 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) { - 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" + 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" && JOB_NAME.contains('merge')) { + charmBranch=BRANCH_NAME + } + + 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() + if( resourceName != "null" ) { + sh "charmcraft resource-revisions $charmName $resourceName | head -2 | tail -1 | awk '{print \$1}'" + def resourceVers = sh( + returnStdout:true, + script: "charmcraft resource-revisions $charmName $resourceName | head -2 | tail -1 | awk '{print \$1}'" + ).trim() + + resourceArgument = "--resource $resourceName:$resourceVers" + + resourceName = sh( + returnStdout:true, + script: "cat metadata.yaml | yq '.resources | keys | .[1]'").trim() + + if( resourceName != "null" ) { + resourceVers = sh( + returnStdout:true, + script: "charmcraft resource-revisions $charmName $resourceName | head -2 | tail -1 | awk '{print \$1}'" + ).trim() + resourceArgument += " --resource $resourceName:$resourceVers" + } + } + + } 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++ } } } @@ -227,7 +266,8 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa def downstream_params_stage_3 = [ string(name: 'GERRIT_BRANCH', value: "${branch}"), string(name: 'INSTALLER', value: "Default" ), - string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu20.04" ), + string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu22.04" ), + string(name: 'OPENSTACK_OSM_FLAVOR', value: "osm.sanity" ), string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ), string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ), booleanParam(name: 'DO_STAGE_4', value: do_stage_4 )