Fix: packaging job format

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index b2ae4a58c6e01581a1c96f00f3cfa87b68f7dd96..0de0f532031e8032196dd6360e307e6e844e9bd1 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -1,21 +1,11 @@
 ---
-- 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-root: "$WORKSPACE/odl-docker"
     docker-build-args: "--network=host"
@@ -32,8 +22,12 @@
           branch: stable/silicon
 
 - 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"