Merge "Change serverID to site"

diff --git a/global-jjb b/global-jjb
index 794042c..4f69d87 160000 (submodule)
--- 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 68a8908..995e611 100644 (file)
--- 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}"