X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fit-dep%2Fit-dep.yaml;h=e21e9e2fe677e691077e0e4e5c754056eaaaafb4;hb=c361074bb1cd41c125b3aa27eabc9b6c8cb7626c;hp=060490b6ccc05ac9bc36df2d89d9a91f78e2e666;hpb=efd8522cdfc154f66c34103b7c3183fa02c36bcd;p=ci-management.git

diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml
index 060490b6..e21e9e2f 100644
--- a/jjb/it-dep/it-dep.yaml
+++ b/jjb/it-dep/it-dep.yaml
@@ -14,15 +14,10 @@
       - gerrit-info-yaml-verify
 
 - it_dep_common: &it_dep_common
-    # values apply to all RIC docker-build projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
+    # values apply to all it/dep docker projects
     name: it-dep-docker-common
-    build-node: ubuntu1804-docker-4c-4g
-    # pull from the public mirror + releases registry
-    container-public-registry: nexus3.o-ran-sc.org:10001
-    # push to the staging repo bcos all builds are RCs
-    container-push-registry: nexus3.o-ran-sc.org:10004
+    # git repo
+    project: it/dep
     # maven settings file has docker credentials
     mvn-settings: it-dep-settings
     # use host network to clone from our gerrit
@@ -34,11 +29,10 @@
           branch: master
 
 - 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-helm
-    # git repo
-    project: it/dep
     # jenkins job name prefix
     project-name: '{name}'
     # image name
@@ -49,40 +43,34 @@
     container-tag-method: latest
     jobs:
       - gerrit-docker-verify
-    <<: *it_dep_common
 
 - project:
+    <<: *it_dep_common
     name: it-dep-secret
-    # git repo
-    project: it/dep
     # jenkins job name prefix
     project-name: '{name}'
     # image name
     docker-name: '{name}'
     # root of docker build
-    docker-root: ric-infra/25-tiller/docker
+    docker-root: ric-infra/45-Tiller/docker
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
     jobs:
       - '{project-name}-gerrit-docker-jobs'
-    <<: *it_dep_common
 
 - project:
+    <<: *it_dep_common
     name: it-dep-init
-    # git repo
-    project: it/dep
     # jenkins job name prefix
     project-name: '{name}'
     # image name
     docker-name: '{name}'
     # root of docker build
     docker-root: ric-common/Initcontainer/docker
-    # maven settings file has docker credentials
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
     jobs:
       - '{project-name}-gerrit-docker-jobs'
-    <<: *it_dep_common