Refactor!: Update JJB code to comply with 5.x

[ci-management.git] / jjb / it-dep / it-dep.yaml

diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml
index bc80644..7190f2e 100644 (file)
--- a/jjb/it-dep/it-dep.yaml
+++ b/jjb/it-dep/it-dep.yaml
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- it_dep_common: &it_dep_common
-    # values apply to all it/dep docker projects
+- _it_dep_common: &it_dep_common
+    # values apply to all it/dep projects
     name: it-dep-docker-common
     # git repo
     project: it/dep
@@ -26,9 +26,6 @@
     docker-build-args: '--network=host'
     # source of docker tag
     container-tag-method: yaml-file
-    stream:
-      - master:
-          branch: master
 
 - project:
     <<: *it_dep_common
@@ -36,6 +33,7 @@
     # no image needs to be pushed, so there is no merge job.
     name: it-dep-helm
     # jenkins job name prefix
+    build-timeout: 120
     project-name: '{name}'
     # image name
     docker-name: 'o-ran-sc/{name}'
@@ -43,8 +41,33 @@
     docker-build-args: -f ci/Dockerfile
     # any tag will do
     container-tag-method: latest
+    submodule-disable: true
     jobs:
       - gerrit-docker-verify
+    stream:
+      - all:
+          branch: '*'
+
+- project:
+    <<: *it_dep_common
+    # Verify helm charts using a Docker build process.
+    # no image needs to be pushed, so there is no merge job.
+    name: it-dep-smo-install
+    # jenkins job name prefix
+    build-timeout: 120
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # dockerfile is in subdir
+    docker-build-args: -f ci/Dockerfile-smo-install
+    # any tag will do
+    container-tag-method: latest
+    submodule-disable: true
+    jobs:
+      - gerrit-docker-verify
+    stream:
+      - all:
+          branch: '*'
 
 # build and publish packages to PackageCloud.io
 - project:
@@ -58,6 +81,9 @@
     docker-name: 'o-ran-sc/{name}'
     # use host network for network resources
     docker-build-args: '--network=host -f ci/Dockerfile-package'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'ci/package-tag.yaml'
     jobs:
       - gerrit-docker-verify
       - oran-gerrit-docker-ci-pc-merge
@@ -73,13 +99,16 @@
     # image name
     docker-name: 'o-ran-sc/{name}'
     # root of docker build
-    docker-root: ric-infra/45-Tiller/docker
+    docker-root: ci/tiller-secret-gen
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
     jobs:
       - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - project:
     <<: *it_dep_common
@@ -95,14 +124,23 @@
         pattern: '{docker-root}/.*'
     jobs:
       - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - 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'
 
+
+- project:
+    <<: *it_dep_common
+    name: it-dep-packagecloud-release
+    jobs:
+      - 'gerrit-packagecloud-release-verify'
+      - 'gerrit-packagecloud-release-merge'