X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=5f8369eacf3d9680ed59f72dc66392da2ef1cede;hb=06cacb28e8256c0d7c287516f7aaddb6e3fb6d21;hp=4587cafee5b3008fb0ba8e5a62a53a9b64c91473;hpb=950baea7d7e2c9e53ae3ba9a972e5672fd3f8430;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 4587cafe..5f8369ea 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -153,7 +153,8 @@ void archive_logs(Map remote) { sshCommand remote: remote, command: '''ls -al logs''' sshGet remote: remote, from: 'logs', into: '.', override: true sh 'cp logs/* .' - archiveArtifacts artifacts: '*.log' + sshGet remote: remote, from: 'ens3.pcap', into: 'ens3.pcap', override: true + archiveArtifacts artifacts: '*.log, *.pcap' } String get_value(String key, String output) { @@ -317,9 +318,10 @@ node("${params.NODE}") { repo_port = sh(script: 'echo $(python -c \'import socket; s=socket.socket(); s.bind(("", 0));' + 'print(s.getsockname()[1]); s.close()\');', returnStdout: true).trim() - repo_base_url = ci_helper.start_http_server(pwd, http_server_name, repo_port) + internal_docker_http_server_url = ci_helper.start_http_server(pwd, http_server_name, repo_port) NODE_IP_ADDRESS = sh(returnStdout: true, script: "echo ${SSH_CONNECTION} | awk '{print \$3}'").trim() + ci_helper.check_status_http_server(NODE_IP_ADDRESS, repo_port) } // Unpack devops package into temporary location so that we use it from upstream if it was part of a patch @@ -448,6 +450,7 @@ node("${params.NODE}") { ] // Force time sync to avoid clock drift and invalid certificates + sshCommand remote: remote, command: 'nohup sudo tcpdump -i ens3 -w ens3.pcap -s 400 & sleep 5' 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' @@ -543,6 +546,10 @@ node("${params.NODE}") { prometheusPort = 9091 osmHostname = IP_ADDRESS } + sshCommand remote: remote, command: """ + sudo killall tcpdump + """ + } // stage("Install") /////////////////////////////////////////////////////////////////////////////////////// // Health check of installed OSM in remote vm @@ -565,6 +572,7 @@ node("${params.NODE}") { if ( params.DO_ROBOT ) { try { stage('System Integration Test') { + if (useCharmedInstaller) { tempdir = sh(returnStdout: true, script: 'mktemp -d').trim() sh(script: "touch ${tempdir}/hosts") @@ -614,9 +622,6 @@ EOF""" if (params.SAVE_ARTIFACTS_OVERRIDE || stage_archive) { stage('Archive') { - sh "echo ${containerName} > build_version.txt" - archiveArtifacts artifacts: 'build_version.txt', fingerprint: true - // Archive the tested repo dir("${RELEASE_DIR}") { ci_helper.archive(params.ARTIFACTORY_SERVER, RELEASE, GERRIT_BRANCH, 'tested')