From 25dd3a568753a012fd1bc94d83fc761848936142 Mon Sep 17 00:00:00 2001 From: Ronelle Landy Date: Thu, 16 Nov 2017 11:26:09 -0500 Subject: [PATCH] Specify docker.io defaults for upstream config release files. https://review.openstack.org/#/c/520201/ changes the defaults to use the rdoproject registry values. This review overrides those values for upstream tests. Closes-Bug: 1732477 Change-Id: I363a0fa5742a02d267a93bc5db1dc72a4b2fe414 --- config/release/tripleo-ci/master-undercloud-pike-overcloud.yml | 3 +++ config/release/tripleo-ci/master.yml | 1 + config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml | 3 +++ config/release/tripleo-ci/pike.yml | 1 + 4 files changed, 8 insertions(+) diff --git a/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml b/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml index fdd24b7c5..11ffef601 100644 --- a/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml +++ b/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml @@ -5,6 +5,9 @@ target_upgrade_version: queens overcloud_release: pike dlrn_hash_tag: current-tripleo dlrn_hash_tag_newest: current +docker_registry_host: trunk.registry.rdoproject.org +docker_registry_namespace: "{{ release }}" +docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" undercloud_image_url: https://images.rdoproject.org/master/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/stable/undercloud.qcow2 ipa_image_url: http://66.187.229.139/builds-master/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/ironic-python-agent.tar overcloud_image_url: http://66.187.229.139/builds-pike/current-tripleo/overcloud-full.tar diff --git a/config/release/tripleo-ci/master.yml b/config/release/tripleo-ci/master.yml index 56a1e2eff..0603c68e7 100644 --- a/config/release/tripleo-ci/master.yml +++ b/config/release/tripleo-ci/master.yml @@ -16,6 +16,7 @@ inject_images: release: master dlrn_hash_tag: current-tripleo dlrn_hash_tag_newest: current +docker_registry_host: docker.io docker_registry_namespace: tripleomaster docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" overcloud_image_url: http://66.187.229.139/builds-master/current-tripleo/overcloud-full.tar diff --git a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml index ad7494f33..b81cd0373 100644 --- a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml +++ b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml @@ -5,6 +5,9 @@ target_upgrade_version: pike overcloud_release: ocata dlrn_hash_tag: current-tripleo dlrn_hash_tag_newest: consistent +docker_registry_host: trunk.registry.rdoproject.org +docker_registry_namespace: "{{ release }}" +docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" undercloud_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/stable/undercloud.qcow2 ipa_image_url: http://66.187.229.139/builds-pike/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/ironic-python-agent.tar overcloud_image_url: http://66.187.229.139/builds-ocata/current-tripleo/overcloud-full.tar diff --git a/config/release/tripleo-ci/pike.yml b/config/release/tripleo-ci/pike.yml index fa4493aeb..e1fd0ab4b 100644 --- a/config/release/tripleo-ci/pike.yml +++ b/config/release/tripleo-ci/pike.yml @@ -16,6 +16,7 @@ inject_images: release: pike dlrn_hash_tag: current-tripleo dlrn_hash_tag_newest: current +docker_registry_host: docker.io docker_registry_namespace: tripleopike docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" overcloud_image_url: http://66.187.229.139/builds-pike/current-tripleo/overcloud-full.tar