X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=a5eba643d5350298115790c114f3d43e2c231e17;hb=779b1bfccb3583a8e232f8f80776de9ad5ee8284;hp=dc155a194cc362f5bc21608e284f0e011bb7e599;hpb=38e4926c6f1d56df6690c8e3689a0e4bf1ce716a;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index dc155a19..a5eba643 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 {
@@ -51,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 (!JOB_NAME.contains('merge')) {
+        if (!isMergeJob) {
             sh "devops-stages/stage-releasenote.sh"
         }
         else {
@@ -99,41 +100,18 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
         }
     }
 
-    if (fileExists('snap/snapcraft.yaml')) {
-        stage('Snap build') {
-            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"
-                sh "snapcraft --use-lxd"
-                sh "mv ${WORKSPACE}/${mdg}_*.snap ${WORKSPACE}/${mdg}.snap"
-                sh "sudo rm -rf ${WORKSPACE}/stage/ ${WORKSPACE}/parts/ ${WORKSPACE}/prime/"
-
-                REV=""
-                if ( !JOB_NAME.contains('merge') ) {
-                    REV="/"+"${GERRIT_REFSPEC}".replaceAll('/','-')
-                }
-                channel="latest"
-                if (BRANCH_NAME.startsWith("v")) {
-                    channel=BRANCH_NAME.substring(1)
-                } else if (BRANCH_NAME!="master") {
-                    REV="/"+BRANCH_NAME+REV.replaceAll('/','-')
-                }
-
-                sh "snapcraft push --release=${channel}/edge${REV} ${mdg}.snap"
-                sh "sudo rm -rf ${WORKSPACE}/*.snap"
-            }
-        }
-    }
-
     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 )
+                booleanParam(name: 'DO_STAGE_4', value: do_stage_4 ),
+                booleanParam(name: 'TRY_JUJU_INSTALLATION', value: false),
+                booleanParam(name: 'TRY_OLD_SERVICE_ASSURANCE', value: false),
             ]
             stage_3_job = "osm-stage_3"
             if ( JOB_NAME.contains('merge') ) {