Minor fix in stage3 during push to dockerhub

[osm/devops.git] / jenkins / ci-pipelines / ci_stage_3.groovy

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index a65b8b7..5255f9b 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -104,7 +104,8 @@ void run_robot_systest(String tagName,
            -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:${tagName} \
            -c -t ${testName}""")
     } finally {
-        sh("cp ${tempdir}/* .")
+        sh("cp ${tempdir}/*.xml .")
+        sh("cp ${tempdir}/*.html .")
         outputDirectory = sh(returnStdout: true, script: 'pwd').trim()
         println("Present Directory is : ${outputDirectory}")
         step([
@@ -496,7 +497,7 @@ node("${params.NODE}") {
                     ]
 
                     sshCommand remote: remote, command: '''
-                        wget https://osm-download.etsi.org/ftp/osm-11.0-eleven/install_osm.sh
+                        wget https://osm-download.etsi.org/ftp/osm-12.0-twelve/install_osm.sh
                         chmod +x ./install_osm.sh
                         sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc
                     '''
@@ -632,6 +633,7 @@ EOF"""
 
                                 parallelSteps[module] = {
                                     dir("$module") {
+                                        sh("docker pull ${INTERNAL_DOCKER_REGISTRY}opensourcemano/${moduleName}:${moduleTag}")
                                         sh("""docker tag opensourcemano/${moduleName}:${moduleTag} \
                                            opensourcemano/${moduleName}:${dockerTag}""")
                                         sh "docker push opensourcemano/${moduleName}:${dockerTag}"