summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorYibo Cai <yibo.cai@arm.com>2018-06-01 10:11:45 +0800
committerYibo Cai <yibo.cai@arm.com>2018-06-01 10:34:29 +0800
commit3d2f57be60c2a841bc5b9e7b764a47624cbde329 (patch)
treed60ad703fa04c922d43acdf44c09759d62ad55f2 /jjb
parenta5ada7e9390cb87b858a29370a7dc09507c07c2e (diff)
jjb/releng: fix compass container build error
Error log: https://build.opnfv.org/ci/job/compass-tasks-base-build-arm64-master/1/console Change-Id: I47ef2ede64d63fb3e9a500dc48cdd510ee9ff235 Signed-off-by: Yibo Cai <yibo.cai@arm.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/releng/compass4nfv-docker.yaml26
1 files changed, 16 insertions, 10 deletions
diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index d9a8b9227..7bfda552d 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:
@@ -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
@@ -236,6 +234,14 @@
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}"
description: "Project name used to enable job conditions"