diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-06-02 00:19:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-02 00:19:39 +0000 |
| commit | eb7e71885b912b5b81b11eeb5b1097310c349b90 (patch) | |
| tree | 8fbe0f657de2e5e25cc5a1d80c0d40f4fff82b3f | |
| parent | d578ee3978271159dae341e652cc847c8b44373f (diff) | |
| parent | 3d2f57be60c2a841bc5b9e7b764a47624cbde329 (diff) | |
Merge "jjb/releng: fix compass container build error"
| -rw-r--r-- | jjb/releng/compass4nfv-docker.yaml | 26 |
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" |