From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 12 Jun 2019 19:43:32 +0000 (+0000)
Subject: Merge "Use yq to extract package paths and copy files"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=cd4cba970c37ea366687dacb6a7db0b4a3c729fc;hp=28b6138af1c97b9ad32206c6966a75f11b7a6fc2;p=ci-management.git

Merge "Use yq to extract package paths and copy files"
---

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index 1cd8a394..67ab66c1 100644
--- 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 4f8ac327..df739479 100644
--- 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 41cf248c..9bce8279 100644
--- 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 33ba94fa..717048dc 100644
--- 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 0c2cb9cd..4cd33909 100644
--- 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 ea269e77..12ff4b22 100644
--- 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-rtmgr/ric-plt-rtmgr.yaml b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
index 0d458b85..ceded388 100644
--- 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