X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=44117adea80b360ca65d79ef47da8078001739c2;hb=refs%2Fchanges%2F03%2F11903%2F2;hp=8b43992df240f0ff050698b9c0a92afd25b0a674;hpb=fc706140ff12a1e536583981c8203e26eedd407c;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 8b43992d..44117ade 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -212,28 +212,29 @@ node("${params.NODE}") {
                     def upstreamComponent=""
                     if ( params.UPSTREAM_JOB_NAME ) {
                         println("Fetching upstream job artifact from ${params.UPSTREAM_JOB_NAME}")
+                        lock('Artifactory') {
+                            step ([$class: 'CopyArtifact',
+                                projectName: "${params.UPSTREAM_JOB_NAME}",
+                                selector: [$class: 'SpecificBuildSelector',
+                                buildNumber: "${params.UPSTREAM_JOB_NUMBER}"]
+                                ])
+
+                            upstreamComponent = ci_helper.get_mdg_from_project(
+                                ci_helper.get_env_value('build.env','GERRIT_PROJECT'))
+                            def buildNumber = ci_helper.get_env_value('build.env','BUILD_NUMBER')
+                            dir("$upstreamComponent") {
+                                // the upstream job name contains suffix with the project. Need this stripped off
+                                def project_without_branch = params.UPSTREAM_JOB_NAME.split('/')[0]
+                                def packages = ci_helper.get_archive(params.ARTIFACTORY_SERVER,
+                                    upstreamComponent,
+                                    GERRIT_BRANCH,
+                                    "${project_without_branch} :: ${GERRIT_BRANCH}",
+                                    buildNumber)
 
-                        step ([$class: 'CopyArtifact',
-                               projectName: "${params.UPSTREAM_JOB_NAME}",
-                               selector: [$class: 'SpecificBuildSelector',
-                               buildNumber: "${params.UPSTREAM_JOB_NUMBER}"]
-                              ])
-
-                        upstreamComponent = ci_helper.get_mdg_from_project(
-                            ci_helper.get_env_value('build.env','GERRIT_PROJECT'))
-                        def buildNumber = ci_helper.get_env_value('build.env','BUILD_NUMBER')
-                        dir("$upstreamComponent") {
-                            // the upstream job name contains suffix with the project. Need this stripped off
-                            def project_without_branch = params.UPSTREAM_JOB_NAME.split('/')[0]
-                            def packages = ci_helper.get_archive(params.ARTIFACTORY_SERVER,
-                                upstreamComponent,
-                                GERRIT_BRANCH,
-                                "${project_without_branch} :: ${GERRIT_BRANCH}",
-                                buildNumber)
-
-                            packageList.addAll(packages)
-                            println("Fetched pre-merge ${params.UPSTREAM_JOB_NAME}: ${packages}")
-                        }
+                                packageList.addAll(packages)
+                                println("Fetched pre-merge ${params.UPSTREAM_JOB_NAME}: ${packages}")
+                            }
+                        } // lock artifactory
                     }
 
                     parallelSteps = [:]
@@ -262,7 +263,9 @@ node("${params.NODE}") {
                             }
                         }
                     }
-                    parallel parallelSteps
+                    lock('Artifactory') {
+                        parallel parallelSteps
+                    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // Create Devops APT repository
@@ -447,10 +450,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: """