X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fcompass4nfv-docker.yaml;h=2a5453658e8b44015f6a7a5ae41b1dc392a2c7fa;hb=700ade56798b8c7bb3eed0560e363c915f254b43;hp=d9a8b92274d05331d80d8ed361c9d1c7af1341e8;hpb=a5ada7e9390cb87b858a29370a7dc09507c07c2e;p=releng.git

diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index d9a8b9227..2a5453658 100644
--- 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:
@@ -43,7 +43,6 @@
         PUSH_IMAGE=$PUSH_IMAGE
         COMMIT_ID=$COMMIT_ID
         GERRIT_REFNAME=$GERRIT_REFNAME
-        DOCKERFILE=$DOCKERFILE
       kill-phase-on: FAILURE
       abort-all-jobs: false
 
@@ -77,6 +76,8 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: 'opnfv-build-ubuntu'
+          docker_file: 'Dockerfile'
+          arch_tag: 'amd64'
 
     properties:
       - throttle:
@@ -163,6 +164,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 +174,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 +188,8 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: 'opnfv-build-ubuntu'
+          docker_file: 'Dockerfile'
+          arch_tag: 'amd64'
     builders:
       - shell: |
           #!/bin/bash -ex
@@ -235,6 +232,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}"