X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fit-dev%2Fit-dev-docker.yaml;h=ffa365479a5d1c34ac444131f54a3b1133b888e5;hb=dda3ea4b9ad8ae631ca41c090444971cf8544591;hp=950bb742f60ef1c530e05a30b556563f556262e0;hpb=632f779909a91da7446777619a077172b6969a13;p=ci-management.git

diff --git a/jjb/it-dev/it-dev-docker.yaml b/jjb/it-dev/it-dev-docker.yaml
index 950bb742..ffa36547 100644
--- a/jjb/it-dev/it-dev-docker.yaml
+++ b/jjb/it-dev/it-dev-docker.yaml
@@ -2,51 +2,63 @@
 # Job configurations for base docker build images
 
 # This macro factors out common configuration
-- it_dev_docker_common: &it_dev_docker_common
+- _it_dev_docker_common: &it_dev_docker_common
     name: it-dev-docker-common
     # git repo
     project: it/dev
     # maven settings file has docker credentials
     mvn-settings: it-dev-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'
+    docker-build-args: "--network=host"
     # get tag from YAML
     container-tag-method: yaml-file
     # Jenkins job prefix
-    project-name: 'it-dev-{img}'
+    project-name: "it-dev-{name}"
     # Docker image name
-    docker-name: '{img}'
+    docker-name: "o-ran-sc/{name}"
     # Directory with Dockerfile
-    docker-root: 'docker/{img}'
+    docker-root: "bldr-imgs/{name}"
     # Limit build trigger to appropriate files;
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'bldr-imgs/{img}/.*'
+        pattern: "bldr-imgs/{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
 
-# Each project name is a subdirectory in bldr-images
+# Each project name is a directory in o-ran-sc/it-dev/bldr-imgs
 # with a Dockerfile and a container-tag.yaml file
-# TODO: coalesce name+img after removing projects from ci-management
 
 - project:
-    name: it-dev-alpine3
-    img: bldr-alpine3
+    name: bldr-alpine3
     <<: *it_dev_docker_common
 
 - project:
-    name: it-dev-alpine3-go
-    img: bldr-alpine3-go
+    name: bldr-alpine3-go
     <<: *it_dev_docker_common
 
 - project:
-    name: it-dev-ubuntu18-c-go
-    img: bldr-ubuntu18-c-go
+    name: bldr-alpine3-mdclog
+    <<: *it_dev_docker_common
+
+- project:
+    name: bldr-alpine3-rmr
+    <<: *it_dev_docker_common
+
+- project:
+    name: bldr-ubuntu18-c-go
+    <<: *it_dev_docker_common
+
+- project:
+    name: bldr-ubuntu20-c-go
+    <<: *it_dev_docker_common
+
+- project:
+    name: bldr-ubuntu22-c-go
     <<: *it_dev_docker_common