From 2f33770d9fea626e6cf6fd9f78d60385131b872a Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Tue, 10 Oct 2017 14:07:35 +0300 Subject: [PATCH] Stop using the cached cirros image In Zuul v2 and v3 cached images are in different paths, so it's impossible to configure job to be compatible with both versions. Use temporary the image from URL until one version will be active. Change-Id: Ifcefa1cbfb05667d124d5cfcdcfc8ff6ccd4e631 --- toci-quickstart/config/testenv/multinode.yml | 4 +++- toci-quickstart/config/testenv/ovb.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/toci-quickstart/config/testenv/multinode.yml b/toci-quickstart/config/testenv/multinode.yml index fb73421b5..87a40a333 100644 --- a/toci-quickstart/config/testenv/multinode.yml +++ b/toci-quickstart/config/testenv/multinode.yml @@ -21,4 +21,6 @@ undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercl generate_pingtest_subunit: true undercloud_undercloud_nameservers: - 127.0.0.1 -tempest_test_image_path: /opt/stack/cache/files/cirros-0.3.5-x86_64-disk.img +# Commented because it has different paths on zuul v2 and v3 +# Using for now the role default value - http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img +#tempest_test_image_path: /opt/stack/cache/files/cirros-0.3.5-x86_64-disk.img diff --git a/toci-quickstart/config/testenv/ovb.yml b/toci-quickstart/config/testenv/ovb.yml index 592e6332f..c242a033b 100644 --- a/toci-quickstart/config/testenv/ovb.yml +++ b/toci-quickstart/config/testenv/ovb.yml @@ -55,4 +55,6 @@ floating_ip_cidr: >- {%- if network_isolation|default(true)|bool %}10.0.0.0/24 {%- else %}192.168.24.0/24 {%- endif %} -tempest_test_image_path: /opt/stack/cache/files/cirros-0.3.5-x86_64-disk.img +# Commented because it has different paths on zuul v2 and v3 +# Using for now the role default value - http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img +#tempest_test_image_path: /opt/stack/cache/files/cirros-0.3.5-x86_64-disk.img