Merge "Define ci image with many common build tools"

[ci-management.git] / jjb / ci-management / ci-docker.yaml

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index 1cd8a39..c5d6e42 100644 (file)
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -11,7 +11,7 @@
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # default to YAML
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
     # maven settings file has docker credentials
     mvn-settings: ci-management-settings
     stream:
@@ -20,19 +20,7 @@
 
 - project:
     <<: *ci_docker_common
-    name: bldr-ric-debian-c
-    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'
-
-- project:
-    <<: *ci_docker_common
-    name: bldr-ric-debian-go
+    name: bldr-ric-debian-python
     project-name: '{project}-{name}'
     docker-name: '{name}'
     docker-root: 'docker/{name}'
@@ -44,7 +32,7 @@
 
 - project:
     <<: *ci_docker_common
-    name: bldr-ric-debian-python
+    name: bldr-ubuntu-c-go-nng
     project-name: '{project}-{name}'
     docker-name: '{name}'
     docker-root: 'docker/{name}'