X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=38b255b307cb067bf9859a61a72f087085b9a6f9;hb=0d45bc887eb1d7d60d5fa79643950ef75a189602;hp=c36a512287e1cb321b48f076fa1d4c427b282004;hpb=5ec8d0adc7c03ec6a7c63f4d23302e2ab619cb82;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index c36a5122..38b255b3 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -35,7 +35,7 @@ properties([ booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'), booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'), booleanParam(defaultValue: true, description: '', name: 'SAVE_ARTIFACTS_ON_SMOKE_SUCCESS'), - booleanParam(defaultValue: false, description: '', name: 'DO_STAGE_4'), + booleanParam(defaultValue: true, description: '', name: 'DO_STAGE_4'), booleanParam(defaultValue: true, description: '', name: 'DO_BUILD'), booleanParam(defaultValue: true, description: '', name: 'DO_INSTALL'), booleanParam(defaultValue: true, description: '', name: 'DO_SMOKE'), @@ -60,7 +60,7 @@ def run_systest(stackName,tagName,testName,envfile=null) { sh(script: "touch ${tempdir}/env") envfile="${tempdir}/env" } - sh "docker run --network net${stackName} --env-file ${envfile} -v ${tempdir}:/usr/share/osm-devops/systest/reports osm/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}" + sh "docker run --network net${stackName} --env-file ${envfile} -v ${tempdir}:/usr/share/osm-devops/systest/reports opensourcemano/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}" sh "cp ${tempdir}/* ." junit '*.xml' } @@ -225,6 +225,11 @@ node("${params.NODE}") { release = "-R ${params.RELEASE}" } + if ( params.REPOSITORY_BASE ) + { + repo_base_url = "-u ${params.REPOSITORY_BASE}" + } + sh """ export PATH=$PATH:/snap/bin installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \ @@ -256,8 +261,14 @@ node("${params.NODE}") { } if ( params.DO_STAGE_4 ) { + // override stage_archive to only archive on stable + stage_archive = false stage("stage_4") { run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1) + + if ( ! currentBuild.result.equals('UNSTABLE') ) { + stage_archive = keep_artifacts + } } }