Merge "Upgrade to latest global-jjb templates"

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index 1cd8a39..67ab66c 100644 (file)
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -11,7 +11,7 @@
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # default to YAML
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     # maven settings file has docker credentials
     mvn-settings: ci-management-settings
     stream:

diff --git a/jjb/ric-app-admin/ric-app-admin.yaml b/jjb/ric-app-admin/ric-app-admin.yaml
index 4f8ac32..df73947 100644 (file)
--- a/jjb/ric-app-admin/ric-app-admin.yaml
+++ b/jjb/ric-app-admin/ric-app-admin.yaml
@@ -19,7 +19,7 @@
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # source of docker tag
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     stream:
       - master:
           branch: master

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index 41cf248..9bce827 100644 (file)
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -19,7 +19,7 @@
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # source of docker tag
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     stream:
       - master:
           branch: master

diff --git a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
index 33ba94f..717048d 100644 (file)
--- a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
+++ b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
@@ -19,7 +19,7 @@
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # source of docker tag
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     stream:
       - master:
           branch: master

diff --git a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
index 0c2cb9c..4cd3390 100644 (file)
--- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
+++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
@@ -17,7 +17,7 @@
     # push to the staging repo bcos all builds are RCs
     container-push-registry: nexus3.o-ran-sc.org:10004
     # source of docker tag
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     stream:
       - master:
           branch: master

diff --git a/jjb/ric-plt-e2/ric-plt-e2.yaml b/jjb/ric-plt-e2/ric-plt-e2.yaml
index ea269e7..12ff4b2 100644 (file)
--- a/jjb/ric-plt-e2/ric-plt-e2.yaml
+++ b/jjb/ric-plt-e2/ric-plt-e2.yaml
@@ -19,7 +19,7 @@
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # source of docker tag
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     stream:
       - master:
           branch: master

diff --git a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
index 46e2267..d1f978a 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -38,8 +38,8 @@
     post_docker_build_script: !include-raw-escape:
       - shell/copy-rmr-packages.sh
     jobs:
-      # merge pushes deb, not image
-      - '{project-name}-gerrit-docker-jobs'
+      # TODO: define a merge template to push package, not image
+      - gerrit-docker-verify
     <<: *rmr_docker_common
 
 - project:

diff --git a/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh b/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh
index e15a1e2..5121abf 100755 (executable)
--- a/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh
+++ b/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh
@@ -19,17 +19,23 @@
 set -eux -o pipefail
 echo "--> copy-rmr-packages.sh"
 
-# extracts to host the artifacts created by the builder
+# extracts artifacts created by the builder
 
-# This file is created by RMr library build process
-# with path(s) to the generated artifact(s)
-file="/tmp/rmr_deb_path"
+# file with paths of generated deb, rpm packages
+pkgs="/tmp/build_output.yml"
 
-# create a container from the image by running a trivial command
+# access builder files by creating a container with a trivial command
 # environment variables are injected in previous Jenkins steps
-container=$(docker run -d "$CONTAINER_PUSH_REGISTRY"/"$DOCKER_NAME":"$DOCKER_IMAGE_TAG" ls "$file")
-docker logs "$container"
-docker cp "$container:$file" .
-filebase=$(basename "$file")
-deb=$(cat "$filebase")
-docker cp "$container:$deb" .
+container=$(docker run -d "$CONTAINER_PUSH_REGISTRY"/"$DOCKER_NAME":"$DOCKER_IMAGE_TAG" ls)
+docker cp "$container":"$pkgs" .
+pkgs_base=$(basename "$pkgs")
+
+deb=$(yq -r .deb "$pkgs_base")
+docker cp "$container":"$deb" .
+deb_base=$(basename "$deb")
+echo "Push file $deb_base" # TODO
+
+rpm=$(yq -r .rpm "$pkgs_base")
+docker cp "$container":"$rpm" .
+rpm_base=$(basename "$rpm")
+echo "Push file $rpm_base" # TODO

diff --git a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
index 0d458b8..ceded38 100644 (file)
--- a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
+++ b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
@@ -19,7 +19,7 @@
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # source of docker tag
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     stream:
       - master:
           branch: master