X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=4587cafee5b3008fb0ba8e5a62a53a9b64c91473;hb=950baea7d7e2c9e53ae3ba9a972e5672fd3f8430;hp=c203313aee5414477b2f59ec73a3ed2af5ad2ecb;hpb=49c463378083dd80e7638c26782fd6d6d7d768fd;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index c203313a..4587cafe 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -176,6 +176,7 @@ node("${params.NODE}") {
     INTERNAL_DOCKER_PROXY = 'http://172.21.1.1:5000'
     APT_PROXY = 'http://172.21.1.1:3142'
     SSH_KEY = '~/hive/cicd_rsa'
+    ARCHIVE_LOGS_FLAG = false
     sh 'env'
 
     tag_or_branch = params.GERRIT_BRANCH.replaceAll(/\./, '')
@@ -433,6 +434,28 @@ node("${params.NODE}") {
                 } // stage("Spawn Remote VM")
 
 ///////////////////////////////////////////////////////////////////////////////////////
+// Checks before installation
+///////////////////////////////////////////////////////////////////////////////////////
+                stage('Checks before installation') {
+                    remote = [
+                        name: containerName,
+                        host: IP_ADDRESS,
+                        user: 'ubuntu',
+                        identityFile: SSH_KEY,
+                        allowAnyHosts: true,
+                        logLevel: 'INFO',
+                        pty: true
+                    ]
+
+                    // Force time sync to avoid clock drift and invalid certificates
+                    sshCommand remote: remote, command: 'sudo apt-get update'
+                    sshCommand remote: remote, command: 'sudo apt-get install -y chrony'
+                    sshCommand remote: remote, command: 'sudo service chrony stop'
+                    sshCommand remote: remote, command: 'sudo chronyd -vq'
+                    sshCommand remote: remote, command: 'sudo service chrony start'
+
+                 } // stage("Checks before installation")
+///////////////////////////////////////////////////////////////////////////////////////
 // Installation
 ///////////////////////////////////////////////////////////////////////////////////////
                 stage('Install') {
@@ -469,15 +492,6 @@ node("${params.NODE}") {
                         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-11.0-eleven/install_osm.sh
                         chmod +x ./install_osm.sh
@@ -534,6 +548,8 @@ node("${params.NODE}") {
 // Health check of installed OSM in remote vm
 ///////////////////////////////////////////////////////////////////////////////////////
                 stage('OSM Health') {
+                    // if this point is reached, logs should be archived
+                    ARCHIVE_LOGS_FLAG = true
                     stackName = 'osm'
                     sshCommand remote: remote, command: """
                         /usr/share/osm-devops/installers/osm_health.sh -k -s ${stackName}
@@ -583,9 +599,7 @@ EOF"""
                         )
                     } // stage("System Integration Test")
                 } finally {
-                    stage('Archive Container Logs') {
-                        // Archive logs to containers_logs.txt
-                        archive_logs(remote)
+                    stage('After System Integration test') {
                         if (currentBuild.result != 'FAILURE') {
                             stage_archive = keep_artifacts
                         } else {
@@ -660,34 +674,52 @@ EOF"""
             } // if (params.SAVE_ARTIFACTS_OVERRIDE || stage_archive)
         } // dir(OSM_DEVOPS)
     } finally {
-        if ( params.DO_INSTALL && server_id != null) {
-            delete_vm = true
-            if (error && params.SAVE_CONTAINER_ON_FAIL ) {
-                delete_vm = false
-            }
-            if (!error && params.SAVE_CONTAINER_ON_PASS ) {
-                delete_vm = false
-            }
+       stage('Archive Container Logs') {
+            if ( ARCHIVE_LOGS_FLAG ) {
+                // Archive logs
+                remote = [
+                    name: containerName,
+                    host: IP_ADDRESS,
+                    user: 'ubuntu',
+                    identityFile: SSH_KEY,
+                    allowAnyHosts: true,
+                    logLevel: 'INFO',
+                    pty: true
+                ]
+                println('Archiving container logs')
+                archive_logs(remote)
+            } // end if ( ARCHIVE_LOGS_FLAG )
+        }
+        stage('Cleanup') {
+            if ( params.DO_INSTALL && server_id != null) {
+                delete_vm = true
+                if (error && params.SAVE_CONTAINER_ON_FAIL ) {
+                    delete_vm = false
+                }
+                if (!error && params.SAVE_CONTAINER_ON_PASS ) {
+                    delete_vm = false
+                }
 
-            if ( delete_vm ) {
-                if (server_id != null) {
-                    println("Deleting VM: $server_id")
-                    sh """#!/bin/sh -e
-                        for line in `grep OS ~/hive/robot-systest.cfg | grep -v OS_CLOUD` ; do export \$line ; done
-                        openstack server delete ${server_id}
-                    """
-                } else {
-                    println("Saved VM $server_id in ETSI VIM")
+                if ( delete_vm ) {
+                    if (server_id != null) {
+                        println("Deleting VM: $server_id")
+                        sh """#!/bin/sh -e
+                            for line in `grep OS ~/hive/robot-systest.cfg | grep -v OS_CLOUD` ; do export \$line ; done
+                            openstack server delete ${server_id}
+                        """
+                    } else {
+                        println("Saved VM $server_id in ETSI VIM")
+                    }
                 }
             }
-        }
-        if ( http_server_name != null ) {
-            sh "docker stop ${http_server_name} || true"
-            sh "docker rm ${http_server_name} || true"
-        }
+            if ( http_server_name != null ) {
+                sh "docker stop ${http_server_name} || true"
+                sh "docker rm ${http_server_name} || true"
+            }
 
-        if ( devopstempdir != null ) {
-            sh "rm -rf ${devopstempdir}"
+            if ( devopstempdir != null ) {
+                sh "rm -rf ${devopstempdir}"
+            }
         }
     }
 }