X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fit-otf%2Fit-otf.yaml;h=13443c8c1f26484d50f905552a954876158586d5;hb=0b918f40c651e938f7b91a528a3f0f016fecf3bd;hp=4c8419aab5bd14071060b12126af37acd6f42f78;hpb=aef676eca991b5eaaca2818105893d31272ddc53;p=ci-management.git

diff --git a/jjb/it-otf/it-otf.yaml b/jjb/it-otf/it-otf.yaml
index 4c8419aa..13443c8c 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
@@ -28,19 +13,28 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- it_otf_common: &it_otf_common
-    # values apply to all it/otf docker projects
-    name: it-otf-docker-common
+- _it_otf_common: &it_otf_common # values apply to all it/otf docker projects
+    name: it_otf_common
     # git repo
     project: it/otf
+    # jenkins job name prefix
+    project-name: "{name}"
     # source of docker tag
     container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
     # maven settings file has docker credentials
     mvn-settings: it-otf-settings
+    # image name
+    docker-name: "o-ran-sc/{name}"
+    # dockerfile is in subdir of docker root
+    docker-build-args: "--network=host -f ./docker/Dockerfile"
+    # tag file is in subdir
+    container-tag-yaml-dir: "{docker-root}/docker"
+    # build only on relevant changes
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "{docker-root}/.*"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -48,89 +42,106 @@
 - project:
     <<: *it_otf_common
     name: it-otf-oran-ric-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
     # start in parent directory with shared files
     docker-root: oran-ric-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
     name: it-otf-frontend
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
     # start in parent directory with shared files
     docker-root: otf-frontend
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
     name: it-otf-ping-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
     # start in parent directory with shared files
     docker-root: otf-ping-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
     name: it-otf-robot-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
     # start in parent directory with shared files
     docker-root: otf-robot-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
     name: it-otf-ssh-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
     # start in parent directory with shared files
     docker-root: otf-ssh-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+    container-tag-yaml-dir: "{docker-root}"
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-camunda
+    # start in parent directory with shared files
+    docker-root: otf-camunda
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-service-api
+    # start in parent directory with shared files
+    docker-root: otf-service-api
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-smo-o1-vth
+    # start in parent directory with shared files
+    docker-root: smo-o1-vth
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-dmaap-vth
+    # start in parent directory with shared files
+    docker-root: dmaap-vth
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-a1-mediator-vth
+    # start in parent directory with shared files
+    docker-root: a1-mediator-vth
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-a1-sdnc-vth
+    # start in parent directory with shared files
+    docker-root: a1-sdnc-vth
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-a1-policy-manager-vth
+    # start in parent directory with shared files
+    docker-root: a1-policy-manager-vth
+
+- project:
+    name: it-otf-release
+    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
+    mvn-settings: it-otf-settings
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - "{project-name}-gerrit-release-jobs"