From: Houa Yang <hyang@contractor.linuxfoundation.org>
Date: Fri, 22 Nov 2019 21:34:48 +0000 (-0600)
Subject: Add packagecloud verify & merge jobs
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=4473b935b586d1967f3bc0c3df3411d95961f7cf;p=ci-management.git

Add packagecloud verify & merge jobs

Add updated packagecloud verify & merge jobs. Verify job checks
if package exists in staging, merge job promotes packages from
staging to release.

Issue-Id: RELENG-2130, IT-18339
Signed-off-by: Houa Yang <hyang@contractor.linuxfoundation.org>
Change-Id: I9526de8c86a555805860684688143e6e7dd52748
---

diff --git a/global-jjb b/global-jjb
index 794042ce..4f69d87c 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 794042ce858f009db24afb1b6d62bb2c33584c24
+Subproject commit 4f69d87cabcbd08da63baf6a4ba205a8ce9fdd38
diff --git a/jjb/oran-jjb/oran-docker-ci-jobs.yaml b/jjb/oran-jjb/oran-docker-ci-jobs.yaml
index 68a89083..995e611b 100644
--- a/jjb/oran-jjb/oran-docker-ci-jobs.yaml
+++ b/jjb/oran-jjb/oran-docker-ci-jobs.yaml
@@ -81,6 +81,7 @@
     pre_docker_build_script: "# pre docker build script goes here"
     post_docker_build_script: "# post docker build script goes here"
     disable-job: "false"
+    docker-get-container-tag-script: "../shell/docker-get-container-tag.sh"
     docker-root: "$WORKSPACE"
     docker-build-args: ""
     git-url: "$GIT_URL/$PROJECT"
@@ -150,6 +151,7 @@
           container-tag-method: "{container-tag-method}"
           container-tag-yaml-dir: "{container-tag-yaml-dir}"
           docker-root: "{docker-root}"
+          docker-get-container-tag-script: "{docker-get-container-tag-script}"
       - lf-docker-build:
           docker-build-args: "{docker-build-args}"
           docker-name: "{docker-name}"