Merge "Use correct images.rdocloud server at fedora28"

Author: Zuul

config/release/tripleo-ci/Fedora-28/master.yml

@@ -23,8 +23,8 @@ docker_registry_host: docker.io
 docker_registry_namespace: "tripleo{{ release }}"
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 docker_openshift_tag: v3.11.0
-overcloud_image_url: "https://images.rdoproject.org/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar"
-ipa_image_url: "https://images.rdoproject.org/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar"
+overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar"
+ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar"
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;

config/release/tripleo-ci/Fedora-28/promotion-testing-hash-master.yml

@@ -20,10 +20,11 @@ inject_images:
   - "overcloud-full.initrd"
   - "overcloud-full.vmlinuz"
 release: master
+distro_ver: fedora28
 dlrn_hash_tag: tripleo-ci-testing
 # TODO: These images should point to Fedora-specific locations
-overcloud_image_url: https://images.rdoproject.org/master/rdo_trunk/current-tripleo/overcloud-full.tar
-ipa_image_url: https://images.rdoproject.org/master/rdo_trunk/current-tripleo/ironic-python-agent.tar
+overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar"
+ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar"
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;

config/release/tripleo-ci/Fedora-28/promotion-testing-hash-stein.yml

@@ -20,10 +20,11 @@ inject_images:
   - "overcloud-full.initrd"
   - "overcloud-full.vmlinuz"
 release: stein
+distro_ver: fedora28
 dlrn_hash_tag: tripleo-ci-testing
 # TODO: These images should point to Fedora-specific locations
-overcloud_image_url: https://images.rdoproject.org/stein/rdo_trunk/current-tripleo/overcloud-full.tar
-ipa_image_url: https://images.rdoproject.org/stein/rdo_trunk/current-tripleo/ironic-python-agent.tar
+overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar"
+ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar"
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;

config/release/tripleo-ci/Fedora-28/stein.yml

@@ -23,8 +23,8 @@ docker_registry_host: docker.io
 docker_registry_namespace: "tripleo{{ release }}"
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 docker_openshift_tag: v3.11.0
-overcloud_image_url: "https://images.rdoproject.org/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar"
-ipa_image_url: "https://images.rdoproject.org/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar"
+overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar"
+ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar"
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;