X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=1542cd73eac88d9d2620d520e9279e4deacd081c;hb=5a6d11284fc7a4b1fdc27ffecf2221cbb3f27550;hp=8804ceec9b591653e30cb19972066852b61cf637;hpb=331cd2c480fbe17a5d7a7ccd774e08e1e14951fc;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 8804ceec..1542cd73 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -32,6 +32,7 @@ properties([
         string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
         string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'),
         string(defaultValue: 'testing-daily', description: '', name: 'DOCKER_TAG'),
+        string(defaultValue: 'ubuntu20.04', description: '', name: 'OPENSTACK_BASE_IMAGE'),
         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'),
@@ -63,14 +64,13 @@ void run_robot_systest(String tagName,
                        Integer prometheusPort=null,
                        String envfile=null,
                        String portmappingfile=null,
-                       String jujudata=null,
                        String kubeconfig=null,
                        String clouds=null,
                        String hostfile=null,
                        String jujuPassword=null,
                        String osmRSAfile=null,
-                       String passThreshold='0.0',
-                       String unstableThreshold='0.0') {
+                       String pass_th='0.0',
+                       String unstable_th='0.0') {
     tempdir = sh(returnStdout: true, script: 'mktemp -d').trim()
     if ( !envfile ) {
         sh(script: "touch ${tempdir}/env")
@@ -91,7 +91,7 @@ void run_robot_systest(String tagName,
     }
 
     try {
-        sh "docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${jujudata}:/root/.local/share/juju -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:${tagName} -c -t ${testName}"
+        sh "docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:${tagName} -c -t ${testName}"
     } finally {
         sh "cp ${tempdir}/* ."
         outputDirectory = sh(returnStdout: true, script: "pwd").trim()
@@ -191,7 +191,6 @@ node("${params.NODE}") {
     server_id = null
     http_server_name = null
     devopstempdir = null
-    jujutempdir = null
     useCharmedInstaller = params.INSTALLER.equalsIgnoreCase("charmed")
 
     try {
@@ -445,6 +444,15 @@ node("${params.NODE}") {
                     remote.logLevel = 'INFO'
                     remote.pty = true
 
+                    // Force time sync to avoid clock drift and invalid certificates
+                    sshCommand remote: remote, command: """
+                        sudo apt update
+                        sudo apt install -y ntp
+                        sudo service ntp stop
+                        sudo ntpd -gq
+                        sudo service ntp start
+                    """
+
                     sshCommand remote: remote, command: """
                         wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh
                         chmod +x ./install_osm.sh
@@ -504,13 +512,6 @@ node("${params.NODE}") {
                         /usr/share/osm-devops/installers/osm_health.sh -k -s ${stackName}
                     """
                 } // stage("OSM Health")
-///////////////////////////////////////////////////////////////////////////////////////
-// Get juju data from installed OSM in remote vm
-///////////////////////////////////////////////////////////////////////////////////////
-                jujutempdir = sh(returnStdout: true, script: "mktemp -d").trim()
-                jujudatafolder = jujutempdir + '/juju'
-                homefolder = sshCommand remote: remote, command: 'echo ${HOME}'
-                sshGet remote: remote, from: homefolder + '/.local/share/juju', into: jujutempdir, override: true
             } // if ( params.DO_INSTALL )
 
 
@@ -545,7 +546,6 @@ EOF"""
                             prometheusPort,
                             params.ROBOT_VIM,
                             params.ROBOT_PORT_MAPPING_VIM,
-                            jujudatafolder,
                             params.KUBECONFIG,
                             params.CLOUDS,
                             hostfile,
@@ -661,9 +661,5 @@ EOF"""
         if ( devopstempdir != null ) {
             sh "rm -rf ${devopstempdir}"
         }
-
-        if ( jujutempdir != null ) {
-            sh "rm -rf ${jujutempdir}"
-        }
     }
 }