X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=c8cecf856bf721a01be4f1d840016143d7fb47b2;hb=73a7e3341a08a1dd032b82ffc611503fb81a98f8;hp=1e9eb5a467ca56b0dbe45748650a747ba6163bb8;hpb=c21682ce59fc2e73c65c0abee36d990c3fd4b161;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 1e9eb5a4..c8cecf85 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -14,7 +14,13 @@ * License for the specific language governing permissions and limitations * under the License. */ - + +/* Change log: + * 1. Bug 745 : Jayant Madavi : JM00553988@techmahindra.com : 23-july-2019 : Improvement to the code, typically we have 2 or + * more branches whose build gets triggered, ex master & release branch, the previous code was removing any/all docker. + * Now removing previous docker of the same branch, so that the other branch failed docker should not be removed. It also + * acts as clean-up for previous docker remove failure. + */ properties([ parameters([ string(defaultValue: env.GERRIT_BRANCH, description: '', name: 'GERRIT_BRANCH'), @@ -31,16 +37,17 @@ properties([ string(defaultValue: 'dpkg1', description: '', name: 'GPG_KEY_NAME'), string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'), string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'), - string(defaultValue: 'releasefive-daily', description: '', name: 'DOCKER_TAG'), - booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'), + string(defaultValue: 'releasesix-daily', description: '', name: 'DOCKER_TAG'), + booleanParam(defaultValue: true, 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'), booleanParam(defaultValue: true, description: '', name: 'DO_DOCKERPUSH'), booleanParam(defaultValue: false, description: '', name: 'SAVE_ARTIFACTS_OVERRIDE'), + string(defaultValue: '/home/jenkins/hive/openstack-etsi.rc', description: '', name: 'HIVE_VIM_1'), ]) ]) @@ -52,9 +59,14 @@ def uninstall_osm(stackName) { """ } -def run_systest(stackName,tagName,testName) { +def run_systest(stackName,tagName,testName,envfile=null) { tempdir = sh(returnStdout: true, script: "mktemp -d").trim() - sh "docker run --network net${stackName} -v ${tempdir}:/usr/share/osm-devops/systest/reports osm/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}" + if ( !envfile ) + { + 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 opensourcemano/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}" sh "cp ${tempdir}/* ." junit '*.xml' } @@ -95,7 +107,7 @@ node("${params.NODE}") { // grab all stable upstream builds based on the dir("${RELEASE}") { - def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL"] + def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI"] for (component in list) { step ([$class: 'CopyArtifact', projectName: "${component}${upstream_main_job}/${GERRIT_BRANCH}"]) @@ -219,6 +231,13 @@ node("${params.NODE}") { release = "-R ${params.RELEASE}" } + if ( params.REPOSITORY_BASE ) + { + repo_base_url = "-u ${params.REPOSITORY_BASE}" + } + if ( params.DO_STAGE_4 ) { + sh "docker stack list |grep "${container_name_prefix}"| awk '{ print \$1 }'| xargs docker stack rm" + } sh """ export PATH=$PATH:/snap/bin installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \ @@ -245,22 +264,25 @@ node("${params.NODE}") { if ( ! currentBuild.result.equals('UNSTABLE') ) { stage_archive = keep_artifacts - } + } else { + error = new Exception("Smoke test failed") + currentBuild.result = 'FAILURE' + } } } if ( params.DO_STAGE_4 ) { + // override stage_archive to only archive on stable + stage_archive = false stage("stage_4") { - def downstream_params = [ - string(name: 'CONTAINER_NAME', value: container_name), - string(name: 'NODE', value: NODE_NAME.split()[0]), - ] - stage_4_result = build job: "${params.DOWNSTREAM_STAGE_NAME}/${GERRIT_BRANCH}", parameters: downstream_params, propagate: false - currentBuild.result = stage_4_result.result - - if ( stage_4_result.getResult().equals('SUCCESS') ) { - stage_archive = true; - } + run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1) + + if ( ! currentBuild.result.equals('UNSTABLE') ) { + stage_archive = keep_artifacts + } else { + error = new Exception("Systest test failed") + currentBuild.result = 'FAILURE' + } } } @@ -288,19 +310,22 @@ node("${params.NODE}") { currentBuild.result = 'FAILURE' } finally { - sh "docker stop ${http_server_name}" - sh "docker rm ${http_server_name}" + if ( params.DO_INSTALL ) { if (error) { if ( !params.SAVE_CONTAINER_ON_FAIL ) { uninstall_osm container_name + sh "docker stop ${http_server_name}" + sh "docker rm ${http_server_name}" } throw error } else { if ( !params.SAVE_CONTAINER_ON_PASS ) { uninstall_osm container_name + sh "docker stop ${http_server_name}" + sh "docker rm ${http_server_name}" } } }