X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=6722e47b74bc094a6a42d67f934f1c491ec3fe3e;hb=fd97f814dcd29f877db7f7f689bfc0b551d37e12;hp=99d075669c823f531afe2edc4401f840a6b37d65;hpb=60fbb95e099692f52594cf7af053b276a4731700;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index 99d07566..6722e47b 100644 --- a/jenkins/ci-pipelines/ci_stage_2.groovy +++ b/jenkins/ci-pipelines/ci_stage_2.groovy @@ -31,6 +31,7 @@ def project_checkout(url_prefix,project,refspec,revision) { 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' @@ -41,7 +42,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa } stage('License Scan') { - if (!JOB_NAME.contains('merge')) { + if (!isMergeJob) { sh "devops/tools/license_scan.sh" } else { @@ -49,6 +50,20 @@ 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 (!isMergeJob) { + sh "devops-stages/stage-releasenote.sh" + } + else { + println("Not checking release notes for merge job") + } + } + else { + println("No releasenote check present") + } + } + container_name = "${project}-${branch}".toLowerCase() stage('Docker-Build') { @@ -85,8 +100,8 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa } } - if (fileExists('snap/snapcraft.yaml')) { - stage('Snap build') { + stage('Snap build') { + if (fileExists('snap/snapcraft.yaml')) { withCredentials([string(credentialsId: 'Snapstore', variable: 'SNAPCRAFT_STORE_CREDENTIALS')]) { sh "sudo rm -rf ${WORKSPACE}/stage/ ${WORKSPACE}/parts/ ${WORKSPACE}/prime/ ${WORKSPACE}/*.snap" sh "sudo snapcraft clean --use-lxd" @@ -95,7 +110,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa sh "sudo rm -rf ${WORKSPACE}/stage/ ${WORKSPACE}/parts/ ${WORKSPACE}/prime/" REV="" - if ( !JOB_NAME.contains('merge') ) { + if ( ! isMergeJob ) { REV="/"+"${GERRIT_REFSPEC}".replaceAll('/','-') } channel="latest" @@ -111,12 +126,148 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa } } + stage('Charm build') { + charms = [ + 'installers/charm/bundles/osm', + 'installers/charm/bundles/osm-ha', + 'installers/charm/grafana', + 'installers/charm/mongodb-exporter', + 'installers/charm/mysqld-exporter', + 'installers/charm/osm-lcm', + 'installers/charm/osm-mon', + 'installers/charm/osm-nbi', + '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', + ] + parallelSteps = [:] + concurrency = sh(returnStdout: true, script: "expr `nproc` / 2").trim() as int + for (charmPath in charms) { + def directory = charmPath + 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() + + 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 + } + + def charmFilename = sh( + returnStdout: true, + script: 'cat pack.json | jq -r ".charms[0], .bundles[0]" | grep -v null').trim() + + 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 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++ + } + } + } + } + } + parallel parallelSteps + } if ( do_stage_3 ) { stage('Build System') { 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 )