X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=14736e94fb6d6824194040446f29ed7be3350ea5;hb=41c7d59869cdd3151b76e370b1476ff6c06f556e;hp=4141f8d49e77e11e2b539b46663419f04e1b43ea;hpb=318551148eb32854ea4959e340eaba56f1f2de5f;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 4141f8d4..14736e94 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -294,10 +294,13 @@ node("${params.NODE}") { http_server_name = "${container_name}-apache" pwd = sh(returnStdout:true, script: 'pwd').trim() - 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) - NODE_IP_ADDRESS=sh(returnStdout: true, script: + repo_port = sh(script: 'echo $(python -c \'import socket; s=socket.socket(); s.bind(("", 0));' + + 'print(s.getsockname()[1]); s.close()\');', + returnStdout: true).trim() + 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 @@ -450,10 +453,10 @@ node("${params.NODE}") { // 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 + sudo apt install -y chrony + sudo service chrony stop + sudo chrony -vq + sudo service chrony start """ sshCommand remote: remote, command: """