X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-docker.yaml;h=253758f1eadda35eafed30d881b8f76e7b617895;hb=refs%2Fheads%2Fmaster;hp=d2ce6e9447101b5ae378d80eaeaff7f94c89b3f0;hpb=3711ffcbfe06f6c872bf4a0871eb5f2a2fcd83ae;p=ci-management.git

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index d2ce6e94..ef5d7d33 100644
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -1,61 +1,43 @@
 ---
-- ci_docker_common: &ci_docker_common
-    # Defines common ci-docker configuration
+# Job configurations for base docker build images
+
+# This macro factors out common configuration
+- _ci_docker_common: &ci_docker_common
     name: ci-docker-common
     # git repo
     project: ci-management
     # maven settings file has docker credentials
     mvn-settings: ci-management-settings
     # build every Saturday
-    cron: 'H H * * 6'
+    cron: "H H * * 6"
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
-    # default to YAML
+    docker-build-args: "--network=host"
+    # get tag from YAML
     container-tag-method: yaml-file
+    # name key is overridden by project template
+    # Jenkins job prefix
+    project-name: "{project}-{name}"
+    # Docker image name
+    docker-name: "{name}"
+    # Directory with Dockerfile
+    docker-root: "docker/{name}"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "docker/{name}/.*"
+    # Includes verify and merge jobs
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
+    # Only build master branch
     stream:
       - master:
           branch: master
 
-- project:
-    <<: *ci_docker_common
-    name: bldr-alpine3
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
+# Each project name is a subdirectory in ci-management/docker
+# with a Dockerfile and a container-tag.yaml file
 
+# This image is deprecated, projects should move to Ubuntu 18
+# TODO remove entirely
 - project:
-    <<: *ci_docker_common
     name: bldr-ubuntu16-c-go
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
-
-- project:
-    <<: *ci_docker_common
-    name: bldr-ubuntu18-c-go
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
-
-- project:
     <<: *ci_docker_common
-    name: bldr-alpine3-go
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'