Merge "Fix container-build job"

This commit is contained in:
Zuul 2019-05-01 13:29:59 +00:00 committed by Gerrit Code Review
commit e01580aabe
1 changed files with 5 additions and 5 deletions

View File

@ -341,7 +341,7 @@
image_name: centos-dcos image_name: centos-dcos
- job: - job:
name: container-build name: magnum-container-build
pre-run: playbooks/container-builder-setup-gate.yaml pre-run: playbooks/container-builder-setup-gate.yaml
run: playbooks/container-builder.yaml run: playbooks/container-builder.yaml
post-run: playbooks/container-builder-copy-logs.yaml post-run: playbooks/container-builder-copy-logs.yaml
@ -358,8 +358,8 @@
- ^magnum/.*$ - ^magnum/.*$
- job: - job:
name: container-publish name: magnum-container-publish
parent: container-build parent: magnum-container-build
post-run: playbooks/container-publish.yaml post-run: playbooks/container-publish.yaml
secrets: secrets:
- magnum_docker_login - magnum_docker_login
@ -381,7 +381,7 @@
- magnum-functional-api-python2 - magnum-functional-api-python2
- openstack-tox-cover: - openstack-tox-cover:
voting: false voting: false
- container-build - magnum-container-build
gate: gate:
queue: magnum queue: magnum
jobs: jobs:
@ -403,4 +403,4 @@
- magnum-dib-buildimage-centos-dcos - magnum-dib-buildimage-centos-dcos
post: post:
jobs: jobs:
- container-publish - magnum-container-publish