Add option to OSM installer to skip caching juju lxd images

[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 d42c6dd..5ebae21 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -41,7 +41,7 @@ properties([
         booleanParam(defaultValue: false, description: '', name: 'SAVE_ARTIFACTS_OVERRIDE'),
         string(defaultValue: '/home/jenkins/hive/openstack-etsi.rc', description: '', name: 'HIVE_VIM_1'),
         booleanParam(defaultValue: true, description: '', name: 'DO_ROBOT'),
-        string(defaultValue: 'sanity', description: 'sanity/regression/daily are the common options', name: 'ROBOT_TAG'),
+        string(defaultValue: 'sanity', description: 'sanity/regression/daily are the common options', name: 'ROBOT_TAG_NAME'),
         string(defaultValue: '/home/jenkins/hive/robot-systest.cfg', description: '', name: 'ROBOT_VIM'),
         string(defaultValue: '/home/jenkins/hive/kubeconfig.yaml', description: '', name: 'KUBECONFIG'),
         string(defaultValue: '/home/jenkins/hive/clouds.yaml', description: '', name: 'CLOUDS'),
@@ -251,11 +251,15 @@ node("${params.NODE}") {
 ///////////////////////////////////////////////////////////////////////////////////////
 // Create Devops APT repository
 ///////////////////////////////////////////////////////////////////////////////////////
-                    sh "mv devops/pool/ pool"
-                    sh "dpkg-sig --sign builder -k ${GPG_KEY_NAME} pool/devops/*"
-                    sh "mkdir -p dists/${params.REPO_DISTRO}/devops/binary-amd64/"
-                    sh "apt-ftparchive packages pool/devops > dists/${params.REPO_DISTRO}/devops/binary-amd64/Packages"
-                    sh "gzip -9fk dists/${params.REPO_DISTRO}/devops/binary-amd64/Packages"
+                    sh "mkdir -p pool"
+                    for (component in [ "devops", "IM", "osmclient" ]) {
+                        sh "ls -al ${component}/pool/"
+                        sh "cp -r ${component}/pool/* pool/"
+                        sh "dpkg-sig --sign builder -k ${GPG_KEY_NAME} pool/${component}/*"
+                        sh "mkdir -p dists/${params.REPO_DISTRO}/${component}/binary-amd64/"
+                        sh "apt-ftparchive packages pool/${component} > dists/${params.REPO_DISTRO}/${component}/binary-amd64/Packages"
+                        sh "gzip -9fk dists/${params.REPO_DISTRO}/${component}/binary-amd64/Packages"
+                    }
 
                     // create and sign the release file
                     sh "apt-ftparchive release dists/${params.REPO_DISTRO} > dists/${params.REPO_DISTRO}/Release"
@@ -465,7 +469,8 @@ node("${params.NODE}") {
                                     ${release} -r unstable \
                                     -d ${USERNAME}:${PASSWORD}@${INTERNAL_DOCKER_REGISTRY} \
                                     -p ${INTERNAL_DOCKER_PROXY} \
-                                    -t ${container_name}
+                                    -t ${container_name} \
+                                    --nocachelxdimages
                             """
                         }
                         prometheusHostname = IP_ADDRESS
@@ -482,7 +487,6 @@ node("${params.NODE}") {
                         /usr/share/osm-devops/installers/osm_health.sh -k -s ${stackName}
                     """
                 } // stage("OSM Health")
-            }
             } // if ( params.DO_INSTALL )
 
 
@@ -511,7 +515,7 @@ EOF"""
 
                         run_robot_systest(
                             container_name,
-                            params.ROBOT_TAG,
+                            params.ROBOT_TAG_NAME,
                             osmHostname,
                             prometheusHostname,
                             prometheusPort,