Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / jjb / packaging / packaging.yaml

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index b2ae4a58c6e01581a1c96f00f3cfa87b68f7dd96..7c8a2b45afa66b7c0253c343545c285a9ec4d1a6 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -1,25 +1,14 @@
 ---
-- packaging_common:
-    &packaging_common # values apply to all packaging docker projects
-    name: packaging-common
-    # git repo
+- project:
+    name: packaging-docker
     project: integration/packaging
-    # jenkins job name prefix
     project-name: packaging
-    # maven settings file has docker credentials
     mvn-settings: packaging-settings
-    # source of docker tag
     container-tag-method: yaml-file
-    # build node
     build-node: centos7-docker-4c-4g
-
-- project:
-    <<: *packaging_common
-    name: packaging-docker
-    docker-name: "opendaylight"
+    docker-name: "opendaylight/opendaylight"
     docker-root: "$WORKSPACE/odl-docker"
     docker-build-args: "--network=host"
-    pre_docker_build_script: "$WORKSPACE/odl-docker/install_docker.sh"
     container-public-registry: nexus3.opendaylight.org:10001
     container-push-registry: nexus3.opendaylight.org:10003
     gerrit_trigger_file_paths:
@@ -28,12 +17,16 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - silicon:
-          branch: stable/silicon
+      - phosphorus:
+          branch: stable/phosphorus
 
 - project:
-    <<: *packaging_common
     name: packaging-release
+    project: integration/packaging
+    project-name: packaging
+    mvn-settings: packaging-settings
+    container-tag-method: yaml-file
+    build-node: centos7-docker-4c-4g
     jobs:
       - "{project-name}-gerrit-release-jobs"