X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fit-dev%2Fit-dev-docker.yaml;h=c58b7ac547ed00c8660538b53245ad113eb3725f;hb=746adf307579bbb5929f8b4f6976e58b526cad66;hp=08701b41a0b49b02362a295b8f6c6ca58b5855c6;hpb=1fed4f01c9f0462ba1eef25b7c1c0179fa20163d;p=ci-management.git

diff --git a/jjb/it-dev/it-dev-docker.yaml b/jjb/it-dev/it-dev-docker.yaml
index 08701b41..c58b7ac5 100644
--- a/jjb/it-dev/it-dev-docker.yaml
+++ b/jjb/it-dev/it-dev-docker.yaml
@@ -15,15 +15,15 @@
     # 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: '{name}'
     # Directory with Dockerfile
-    docker-root: 'bldr-imgs/{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'
@@ -32,21 +32,21 @@
       - 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-rmr
+    <<: *it_dev_docker_common
+
+- project:
+    name: bldr-ubuntu18-c-go
     <<: *it_dev_docker_common