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=1c2274d507a89c394d896d97f102fae50c55ee17;hpb=a7fc7ba8d6743999956704e2cac6b3238a6bdb1b;p=ci-management.git

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index 1c2274d5..ef5d7d33 100644
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -2,32 +2,32 @@
 # Job configurations for base docker build images
 
 # This macro factors out common configuration
-- ci_docker_common: &ci_docker_common
+- _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'
+    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}'
+    project-name: "{project}-{name}"
     # Docker image name
-    docker-name: '{name}'
+    docker-name: "{name}"
     # Directory with Dockerfile
-    docker-root: 'docker/{name}'
+    docker-root: "docker/{name}"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
+        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:
@@ -36,18 +36,8 @@
 # Each project name is a subdirectory in ci-management/docker
 # with a Dockerfile and a container-tag.yaml file
 
-- project:
-    name: bldr-alpine3
-    <<: *ci_docker_common
-
-- project:
-    name: bldr-alpine3-go
-    <<: *ci_docker_common
-
+# This image is deprecated, projects should move to Ubuntu 18
+# TODO remove entirely
 - project:
     name: bldr-ubuntu16-c-go
     <<: *ci_docker_common
-
-- project:
-    name: bldr-ubuntu18-c-go
-    <<: *ci_docker_common