Merge "Use yq to extract package paths and copy files"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Wed, 12 Jun 2019 19:43:32 +0000 (19:43 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Wed, 12 Jun 2019 19:43:32 +0000 (19:43 +0000)
jjb/ci-management/ci-docker.yaml
jjb/ric-app-admin/ric-app-admin.yaml
jjb/ric-plt-a1/ric-plt-a1.yaml
jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
jjb/ric-plt-e2/ric-plt-e2.yaml
jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml

index 1cd8a39..67ab66c 100644 (file)
@@ -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:
index 4f8ac32..df73947 100644 (file)
@@ -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
index 41cf248..9bce827 100644 (file)
@@ -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
index 33ba94f..717048d 100644 (file)
@@ -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
index 0c2cb9c..4cd3390 100644 (file)
@@ -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
index ea269e7..12ff4b2 100644 (file)
@@ -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
index 0d458b8..ceded38 100644 (file)
@@ -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