X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=a5eba643d5350298115790c114f3d43e2c231e17;hb=1c04a5cf993fac5198b77246f8cba6a80b065cb2;hp=4edbd2bf4ec5a8c30ffe0dc15cea37c170abef0b;hpb=a60ec7310d582158700acf9f3fb1945cb05bacca;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 4edbd2bf..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 {
@@ -49,10 +50,25 @@ 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') {
-        sh "docker build -t ${container_name} ."
+        APT_PROXY = "http://172.21.1.1:3142"
+        sh "docker build --build-arg APT_PROXY=${APT_PROXY} -t ${container_name} ."
     }
 
     UID = sh(returnStdout:true,  script: 'id -u').trim()
@@ -63,7 +79,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
             sh "useradd -o -u $UID -d `pwd` -r -g jenkins jenkins"
             sh "echo '#! /bin/sh' > /usr/bin/mesg"
             sh "chmod 755 /usr/bin/mesg"
-            sh "runuser -l jenkins -c devops-stages/stage-test.sh"
+            sh "runuser jenkins -c devops-stages/stage-test.sh"
             if (fileExists('coverage.xml')) {
                 cobertura coberturaReportFile: 'coverage.xml'
             }
@@ -73,51 +89,29 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
         }
         stage('Build') {
             sh(returnStdout:true,
-                script: "runuser -l $USER -c devops-stages/stage-build.sh").trim()
+                script: "runuser jenkins -c devops-stages/stage-build.sh").trim()
         }
         stage('Archive') {
-            sh "runuser -l jenkins -c 'mkdir -p changelog'"
-            sh "runuser -l jenkins -c \"tools/generatechangelog-pipeline.sh > changelog/changelog-${mdg}.html\""
+            sh "runuser jenkins -c 'mkdir -p changelog'"
+            sh "runuser jenkins -c \"devops/tools/generatechangelog-pipeline.sh > changelog/changelog-${mdg}.html\""
             sh(returnStdout:true,
-                script: "runuser -l jenkins -c devops-stages/stage-archive.sh").trim()
+                script: "runuser jenkins -c devops-stages/stage-archive.sh").trim()
             ci_helper.archive(artifactory_server,mdg,branch,'untested')
         }
     }
 
-    if (fileExists('snap/snapcraft.yaml')) {
-        stage('Snap build') {
-            sh "docker pull snapcore/snapcraft:stable"
-            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 "sudo docker run -v ~/.snapcraft:/snapcraft -v ${WORKSPACE}:/build " +
-                "-w /build snapcore/snapcraft:stable /bin/bash -c " +
-                "\"snapcraft login --with /snapcraft/config ; 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: "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') ) {