X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=72318f9aea226220778d92349a47ff3d5e904476;hb=18d047ff163473669a017b6baa1f0bf814344839;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..72318f9a 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -63,7 +63,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,13 +73,13 @@ 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')
         }
     }
@@ -115,6 +115,8 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
         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: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ),
                 string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ),
                 booleanParam(name: 'DO_STAGE_4', value: do_stage_4 )