X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-docker.yaml;h=253758f1eadda35eafed30d881b8f76e7b617895;hb=bbebabca91199730908998b57d5a82a697b2ed7a;hp=9c1a72a45306ab2a66fe46424e5b50cd32521c87;hpb=d905642612e7697fac43a8ecf4c84947a9a67245;p=ci-management.git

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index 9c1a72a4..253758f1 100644
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -1,69 +1,43 @@
 ---
+# Job configurations for base docker build images
+
+# This macro factors out common configuration
 - ci_docker_common: &ci_docker_common
-    # Defines common ci-docker configuration
     name: ci-docker-common
     # git repo
     project: ci-management
-    build-node: ubuntu1804-docker-4c-4g
-    container-public-registry: nexus3.o-ran-sc.org:10001
-    # use the staging repo bcos all builds are RCs
-    container-push-registry: nexus3.o-ran-sc.org:10004
+    # maven settings file has docker credentials
+    mvn-settings: ci-management-settings
+    # build every Saturday
+    cron: 'H H * * 6'
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
-    # default to YAML
+    # get tag from YAML
     container-tag-method: yaml-file
-    # build every Saturday
-    cron: 'H H * * 6'
-    # maven settings file has docker credentials
-    mvn-settings: ci-management-settings
-    stream:
-      - master:
-          branch: master
-
-- project:
-    <<: *ci_docker_common
-    name: bldr-alpine3
+    # 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-root}/.*'
+        pattern: 'docker/{name}/.*'
+    # Includes verify and merge jobs
     jobs:
       - '{project-name}-gerrit-docker-jobs'
+    # Only build master branch
+    stream:
+      - master:
+          branch: master
 
-- project:
-    <<: *ci_docker_common
-    name: bldr-debian-python
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
-    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-root}/.*'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-
-- 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-root}/.*'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'