Merge "jjb/releng: fix compass container build error"

opnfv · Jun 2, 2018 · eb7e718 · eb7e718
2 parents d578ee3 + 3d2f57b
commit eb7e718
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
@@ -19,10 +19,10 @@
     arch_tag:
       - 'amd64':
           slave_label: 'opnfv-build-ubuntu'
-          dockerfile: 'Dockerfile'
+          docker_file: 'Dockerfile'
       - 'arm64':
           slave_label: 'opnfv-build-ubuntu-arm'
-          dockerfile: 'Dockerfile-arm64'
+          docker_file: 'Dockerfile-arm64'
 
     # yamllint disable rule:key-duplicates
     image:
@@ -77,6 +77,8 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: 'opnfv-build-ubuntu'
+          docker_file: 'Dockerfile'
+          arch_tag: 'amd64'
 
     properties:
       - throttle:
@@ -163,6 +165,8 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: '{slave_label}'
+          docker_file: '{docker_file}'
+          arch_tag: '{arch_tag}'
       - string:
           name: DOCKER_REPO_NAME
           default: "opnfv/compass-{image}"
@@ -171,14 +175,6 @@
           name: DOCKER_DIR
           default: "compass-{image}"
           description: "Directory containing files needed by the Dockerfile"
-      - string:
-          name: DOCKERFILE
-          default: '{dockerfile}'
-          description: "Dockerfile to use for creating the image."
-      - string:
-          name: ARCH_TAG
-          default: "{arch_tag}"
-          description: "If set, this value will be added to the docker image tag as a prefix"
     scm:
       - git-scm
     builders:
@@ -193,6 +189,8 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: 'opnfv-build-ubuntu'
+          docker_file: 'Dockerfile'
+          arch_tag: 'amd64'
     builders:
       - shell: |
           #!/bin/bash -ex
@@ -235,6 +233,14 @@
           name: GERRIT_REFNAME
           default: ""
           description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1"
+      - string:
+          name: DOCKERFILE
+          default: '{docker_file}'
+          description: "Dockerfile to use for creating the image."
+      - string:
+          name: ARCH_TAG
+          default: "{arch_tag}"
+          description: "If set, this value will be added to the docker image tag as a prefix"
       - string:
           name: PROJECT
           default: "{project}"