From: wrider <lji@research.att.com>
Date: Tue, 19 Nov 2019 05:37:10 +0000 (-0500)
Subject: Prepare for docker image release for INT repos
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ce1967e911e74a05ea71fb9fbc5735c6e7dddaca;p=ci-management.git

Prepare for docker image release for INT repos

Two changes for preparing for docker image release on JJB
definitions for repos that produce docker iamges:
1. per ToC meetiing on 11/13, we need to prefix docker image name
   with o-ran-sc;
2. define a self-service docker image release job.

Change-Id: I4a183002e8732307f1f7536cfb8828a996512e44
Signed-off-by: wrider <lji@research.att.com>
---

diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml
index 6cc505d0..bc806444 100644
--- a/jjb/it-dep/it-dep.yaml
+++ b/jjb/it-dep/it-dep.yaml
@@ -18,6 +18,8 @@
     name: it-dep-docker-common
     # git repo
     project: it/dep
+    # jenkins job name prefix
+    project-name: it-dep
     # maven settings file has docker credentials
     mvn-settings: it-dep-settings
     # use host network to clone from our gerrit
@@ -36,7 +38,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # dockerfile is in subdir
     docker-build-args: -f ci/Dockerfile
     # any tag will do
@@ -53,7 +55,7 @@
     # image is not pushed, use trivial tag
     container-tag-method: latest
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # use host network for network resources
     docker-build-args: '--network=host -f ci/Dockerfile-package'
     jobs:
@@ -69,7 +71,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # root of docker build
     docker-root: ric-infra/45-Tiller/docker
     # build only on relevant changes
@@ -85,11 +87,22 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # root of docker build
     docker-root: ric-common/Initcontainer/docker
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
\ No newline at end of file
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *it_dep_common
+    name: it-dep-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
diff --git a/jjb/it-otf/it-otf.yaml b/jjb/it-otf/it-otf.yaml
index e228a6b9..3c253226 100644
--- a/jjb/it-otf/it-otf.yaml
+++ b/jjb/it-otf/it-otf.yaml
@@ -1,19 +1,4 @@
 ---
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#   Copyright (c) 2019 Nokia.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
 - project:
     name: it-otf-project-view
     project-name: it-otf
@@ -33,6 +18,8 @@
     name: it-otf-docker-common
     # git repo
     project: it/otf
+    # jenkins job name prefix
+    project-name: it-otf
     # source of docker tag
     container-tag-method: yaml-file
     # maven settings file has docker credentials
@@ -49,7 +36,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: oran-ric-test-head
     # dockerfile is in subdir of docker root
@@ -67,7 +54,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-frontend
     # dockerfile is in subdir of docker root
@@ -85,7 +72,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-ping-test-head
     # dockerfile is in subdir of docker root
@@ -103,7 +90,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-robot-test-head
     # dockerfile is in subdir of docker root
@@ -121,7 +108,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-ssh-test-head
     # dockerfile is in subdir of docker root
@@ -139,7 +126,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-camunda
     # dockerfile is in subdir of docker root
@@ -157,7 +144,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-service-api
     # dockerfile is in subdir of docker root
@@ -168,3 +155,13 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml
index c6981c1a..f45b7778 100644
--- a/jjb/it-test/it-test.yaml
+++ b/jjb/it-test/it-test.yaml
@@ -18,6 +18,8 @@
     name: it-test-docker-common
     # git repo
     project: it/test
+    # jenkins job name prefix
+    project-name: it-test
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
@@ -36,7 +38,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: ric_robot_suite
     # dockerfile is in subdir of docker root
@@ -54,7 +56,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: ric_robot_suite
     # dockerfile is in subdir of docker root
@@ -65,3 +67,13 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
+
+- project:
+    <<: *it_test_common
+    name: it-test-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
\ No newline at end of file