From 94853d19c4bed23ccb7edf24b7e45a8d9448a129 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 12 Jun 2019 14:03:53 -0400 Subject: [PATCH] Repair the method param value to select YAML file Latest docker templates expect 'container-tag-method' for setting the tag source. Signed-off-by: Lott, Christopher (cl778h) Change-Id: Ice5a910e2dc4c133e7185f302ce53dd0bbe37006 --- jjb/ci-management/ci-docker.yaml | 2 +- jjb/ric-app-admin/ric-app-admin.yaml | 2 +- jjb/ric-plt-a1/ric-plt-a1.yaml | 2 +- jjb/ric-plt-appmgr/ric-plt-appmgr.yaml | 2 +- jjb/ric-plt-dbaas/ric-plt-dbaas.yaml | 2 +- jjb/ric-plt-e2/ric-plt-e2.yaml | 2 +- jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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 -- 2.16.6