From f9c8b2ab68e5fe5ea051d26f148750af75d962d9 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Tue, 24 Aug 2021 20:22:33 +0000 Subject: [PATCH] Update default cirros image to 0.5.2 Use the newer cirros 0.5.2 version by default and pass it to python-tempestconf via a proper argument (--image) instead of the override option. Change-Id: I11b42585f609b0759c0eef1e68fa70c55afa3bda --- README.md | 2 +- defaults/main.yaml | 2 +- tasks/generate-tempestconf.sh.j2 | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7b3cd60..b470f81 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ deployment is working by passing refstack tests. | tempest_tag | False | refstack-client's default | String | Tempest will be cloned and checkouted to this specific tag. | | test_list | False | None | String | A path or an URL to a test list text file containing specific test cases. | | upload_results | False | False | Bool | Whether results should be uploaded to the server or not. | -| url_cirros_image | False | http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img | String | A path or a link to a cirros image. | +| url_cirros_image | False | https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img| String | A path or a link to a cirros image. | **\* it's a local path, the path on a machine, the playbook is executed from** diff --git a/defaults/main.yaml b/defaults/main.yaml index d99105a..8fe00be 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -28,6 +28,6 @@ refstack_tempest_plugins: manila: master designate: master heat: master -url_cirros_image: "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" +url_cirros_image: "https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" # a concurrency accounts.yaml file is generated with by tempest tempest_account_concurrency: 3 diff --git a/tasks/generate-tempestconf.sh.j2 b/tasks/generate-tempestconf.sh.j2 index 7709994..b342670 100644 --- a/tasks/generate-tempestconf.sh.j2 +++ b/tasks/generate-tempestconf.sh.j2 @@ -9,14 +9,14 @@ discover-tempest-config \ -v \ --non-admin \ --test-accounts {{ path_to_accounts_file }} \ +--image {{ url_cirros_image }} \ {% if deployer_input is defined %} --deployer-input {{ deployer_input }} \ {% endif %} -validation.run_validation true \ -compute.allow_tenant_isolation true \ -compute-feature-enabled.resize true \ {{ share_tempestconf_overrides | default([]) | join(' ') }} \ {% if additional_tempestconf_params is defined %} {{ additional_tempestconf_params }} \ {% endif %} -image.http_image {{ url_cirros_image }} +validation.run_validation true \ +compute.allow_tenant_isolation true \ +compute-feature-enabled.resize true