zuul: fix image publishing with quay.io

Variable precedence is higher in the playbook than from the job vars
which are provided through the inventory.
Use another variable and default properly instead.

Change-Id: I8c5cf72c78ea01ba1bc0a6fef2f9499837e9b262
This commit is contained in:
David Moreau Simard 2020-10-27 10:34:10 -04:00
parent a2fa087f3c
commit 0493ce7015
No known key found for this signature in database
GPG Key ID: 7D4729EC4E64E8B7
2 changed files with 4 additions and 4 deletions

View File

@ -170,7 +170,7 @@
pre-run: tests/with_container_images.yaml
run: tests/zuul_publish_container_images.yaml
vars:
destination: docker.io/recordsansible/ara-api
destination_repository: docker.io/recordsansible/ara-api
secrets:
- name: ara_registry_credentials
secret: ara_dockerhub_credentials
@ -186,7 +186,7 @@
pre-run: tests/with_container_images.yaml
run: tests/zuul_publish_container_images.yaml
vars:
destination: quay.io/recordsansible/ara-api
destination_repository: quay.io/recordsansible/ara-api
secrets:
- name: ara_registry_credentials
secret: ara_quayio_credentials

View File

@ -15,11 +15,11 @@
# You should have received a copy of the GNU General Public License
# along with ARA. If not, see <http://www.gnu.org/licenses/>.
- name: Publish container images to DockerHub
- name: Publish container images
hosts: all
gather_facts: yes
vars:
destination: docker.io/recordsansible/ara-api
destination: "{{ destination_repository | default('docker.io/recordsansible/ara-api') }}"
images:
# These images are meant to be provided by the "with_container_images.yaml" playbook
- name: localhost/ara-api