X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=6368381717680bf196040fbb06baf43ede5bc251;hb=f1f5b7660c3cebb57f9cdfd596734443b83fa6c4;hp=d7175b80a68c270ccb9e9ee1a71229a497de2874;hpb=a60ec7310d582158700acf9f3fb1945cb05bacca;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index d7175b80..63683817 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -201,21 +201,25 @@ node("${params.NODE}") {
 
                         step ([$class: 'CopyArtifact',
                                projectName: "${params.UPSTREAM_JOB_NAME}",
-                               selector: [$class: 'SpecificBuildSelector', buildNumber: "${params.UPSTREAM_JOB_NUMBER}"]
+                               selector: [$class: 'SpecificBuildSelector',
+                               buildNumber: "${params.UPSTREAM_JOB_NUMBER}"]
                               ])
 
-                        upstreamComponent = ci_helper.get_mdg_from_project(ci_helper.get_env_value('build.env','GERRIT_PROJECT'))
-
-                        // 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}",
-                            ci_helper.get_env_value('build.env','BUILD_NUMBER'))
-
-                        packageList.addAll(packages)
-                        println("${params.UPSTREAM_JOB_NAME}: ${packages}")
+                        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}")
+                        }
                     }
 
                     parallelSteps = [:]
@@ -247,15 +251,14 @@ node("${params.NODE}") {
                     parallel parallelSteps
 
 ///////////////////////////////////////////////////////////////////////////////////////
-// Create APT repository
+// Create Devops APT repository
 ///////////////////////////////////////////////////////////////////////////////////////
-                    for ( component in [ "devops" ] ) {
-                        sh "mv ${component}/pool/${component} pool"
-                        sh "dpkg-sig --sign builder -k ${GPG_KEY_NAME} pool/${component}/*"
-                        sh "mkdir -p dists/${params.REPO_DISTRO}/${component}/binary-amd64/"
-                        sh "apt-ftparchive packages pool/${component} > dists/${params.REPO_DISTRO}/${component}/binary-amd64/Packages"
-                        sh "gzip -9fk dists/${params.REPO_DISTRO}/${component}/binary-amd64/Packages"
-                    }
+                    sh "mv devops/pool/ pool"
+                    sh "dpkg-sig --sign builder -k ${GPG_KEY_NAME} pool/devops/*"
+                    sh "mkdir -p dists/${params.REPO_DISTRO}/devops/binary-amd64/"
+                    sh "apt-ftparchive packages pool/devops > dists/${params.REPO_DISTRO}/devops/binary-amd64/Packages"
+                    sh "gzip -9fk dists/${params.REPO_DISTRO}/devops/binary-amd64/Packages"
+
                     // create and sign the release file
                     sh "apt-ftparchive release dists/${params.REPO_DISTRO} > dists/${params.REPO_DISTRO}/Release"
                     sh "gpg --yes -abs -u ${GPG_KEY_NAME} -o dists/${params.REPO_DISTRO}/Release.gpg dists/${params.REPO_DISTRO}/Release"