X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=99ba6004fd6c4cec4f0ff39c329f54eb9b831339;hb=58af6b1f5c118080954f0b00ecd270bebd8491d0;hp=7e9de04438286a747d7a4bb3fa8acc6054da671a;hpb=4d105e38cb5ac2243ec023b1084b7cef200bf0a2;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 7e9de044..99ba6004 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -14,6 +14,13 @@ * License for the specific language governing permissions and limitations * under the License. */ + +/* Change log: + * 1. Bug 745 : Jayant Madavi, Mrityunjay Yadav : 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. + * 2. Feature 7829 : Mrityunjay Yadav, Jayant Madavi: MY00514913@techmahindra.com : 19-Aug-2019 : Added a parameters & function to invoke Robot test. + */ properties([ parameters([ @@ -28,11 +35,11 @@ properties([ string(defaultValue: '', description: '', name: 'UPSTREAM_JOB_NAME'), string(defaultValue: '', description: '', name: 'UPSTREAM_JOB_NUMBER'), string(defaultValue: '', description: '', name: 'UPSTREAM_JOB_NUMBER'), - string(defaultValue: 'dpkg1', description: '', name: 'GPG_KEY_NAME'), + string(defaultValue: 'OSMETSI', 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: 'releasesix-daily', description: '', name: 'DOCKER_TAG'), - booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'), + 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: true, description: '', name: 'DO_STAGE_4'), @@ -41,7 +48,10 @@ properties([ 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-whitestack.rc', description: '', name: 'HIVE_VIM_1'), + string(defaultValue: '/home/jenkins/hive/openstack-etsi.rc', description: '', name: 'HIVE_VIM_1'), + booleanParam(defaultValue: true, description: '', name: 'DO_ROBOT'), + string(defaultValue: 'sanity', description: 'smoke/vim/sanity/comprehensive are the options', name: 'TEST_NAME'), + string(defaultValue: '/home/jenkins/hive/robot-systest.cfg', description: '', name: 'ROBOT_VIM'), ]) ]) @@ -65,6 +75,30 @@ def run_systest(stackName,tagName,testName,envfile=null) { junit '*.xml' } +def run_robot_systest(stackName,tagName,testName,envfile=null) { + tempdir = sh(returnStdout: true, script: "mktemp -d").trim() + 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/robot-systest/reports opensourcemano/osmclient:${tagName} bash -C /usr/share/osm-devops/robot-systest/run_test.sh --do_install -t ${testName}" + sh "cp ${tempdir}/* ." + outputDirectory = sh(returnStdout: true, script: "pwd").trim() + println ("Present Directory is : ${outputDirectory}") + step([ + $class : 'RobotPublisher', + outputPath : "${outputDirectory}", + outputFileName : "*.xml", + disableArchiveOutput : false, + reportFileName : "report.html", + logFileName : "log.html", + passThreshold : 80, + unstableThreshold: 60.0, + otherFiles : "*.png", + ]) +} + node("${params.NODE}") { sh 'env' @@ -229,7 +263,14 @@ node("${params.NODE}") { { repo_base_url = "-u ${params.REPOSITORY_BASE}" } - + if ( params.DO_STAGE_4 ) { + try { + sh "docker stack list |grep \"${container_name_prefix}\"| awk '{ print \$1 }'| xargs docker stack rm" + } + catch (caughtError) { + println("Caught error: docker stack rm failed!") + } + } sh """ export PATH=$PATH:/snap/bin installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \ @@ -256,19 +297,33 @@ 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") { - run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1) + stage("System Integration Test") { + if ( params.DO_ROBOT ) { + steps { + run_robot_systest(container_name,container_name,params.TEST_NAME,params.ROBOT_VIM) + } + } else { + steps{ + 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' + } } } @@ -296,19 +351,20 @@ 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}" } } }