Reduce repeated key-value pairs

[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 060490b..faa01b8 100644 (file)
--- 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,12 +43,10 @@
     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
@@ -67,22 +59,18 @@
         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