Skip to content

Commit 796eb93

Browse files
eduolivaresdanpawlik
authored andcommitted
[test_operator][tobiko] Replace ubuntu with advanced_vm config
advanced_vm config should be used instead of ubuntu. The corresponding upstream VM image is created with github workflows and the URL is provided as a default value. TOBIKO-142 Signed-off-by: Eduardo Olivares <[email protected]>
1 parent 270f4c1 commit 796eb93

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

roles/test_operator/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Default value: {}
139139
* `cifmw_test_operator_tobiko_pytest_addopts`: (String) `PYTEST_ADDOPTS` env variable with input pytest args. Example: `-m <markers> --maxfail <max-failed-tests> --skipregex <regex>`. Defaults to `null`. In case of `null` value, `PYTEST_ADDOPTS` is not set (tobiko tests are executed without any extra pytest options).
140140
* `cifmw_test_operator_tobiko_prevent_create`: (Boolean) Sets the value of the env variable `TOBIKO_PREVENT_CREATE` that specifies whether tobiko scenario tests create new resources or expect that those resource had been created before. Default to `null`. In case of `null` value, `TOBIKO_PREVENT_CREATE` is not set (tobiko tests create new resources).
141141
* `cifmw_test_operator_tobiko_num_processes`: (Integer) Sets the value of the env variable `TOX_NUM_PROCESSES` that is used to run pytest with `--numprocesses $TOX_NUM_PROCESSES`. Defaults to `null`. In case of `null` value, `TOX_NUM_PROCESSES` is not set (tobiko internally uses the value `auto`, see pytest documentation about the `--numprocesses` option).
142-
* `cifmw_test_operator_tobiko_advanced_image_url`: (String) Tobiko will download images from this URL that will be used to create advance VM instances. By default, the provided image will include all the customizations required by the tobiko tests. Defaults to `https://softwarefactory-project.io/ubuntu-minimal-customized-enp3s0`.
142+
* `cifmw_test_operator_tobiko_advanced_image_url`: (String) Tobiko will download images from this URL that will be used to create advance VM instances. By default, the provided image will include all the customizations required by the tobiko tests. Defaults to `https://github.com/eduolivares/custom-tobiko-images/releases/download/v1.0.4-f42/fedora-custom-42-1.1.qcow2`.
143143
* `cifmw_test_operator_tobiko_kubeconfig_secret`: (String) Name of the Openshift Secret required to use Openshift Client from the Tobiko pod. Default value: `tobiko-secret`
144144
* `cifmw_test_operator_tobiko_openstack_cmd`: (String) Openstack command is used by tobiko to cleanup resources. Default value: `oc -n openstack exec openstackclient -- openstack`
145145
* `cifmw_test_operator_tobiko_override_conf`: (Dict) Overrides the default configuration from `cifmw_test_operator_tobiko_default_conf` that is used to generate the tobiko.conf file. Default value: empty dictionary

roles/test_operator/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ cifmw_test_operator_tobiko_version: master
183183
cifmw_test_operator_tobiko_pytest_addopts: null
184184
cifmw_test_operator_tobiko_prevent_create: null
185185
cifmw_test_operator_tobiko_num_processes: null
186-
cifmw_test_operator_tobiko_advanced_image_url: "https://softwarefactory-project.io/ubuntu-minimal-customized-enp3s0"
186+
cifmw_test_operator_tobiko_advanced_image_url: "https://github.com/openstack-k8s-operators/openstack-k8s-operators-ci/releases/download/v1.0.0/tobiko-custom-v1.0.0.qcow2"
187187
cifmw_test_operator_tobiko_override_conf: {}
188188
cifmw_test_operator_tobiko_kubeconfig_secret: tobiko-secret
189189
cifmw_test_operator_tobiko_openstack_cmd: 'oc -n openstack exec openstackclient -- openstack'

roles/test_operator/vars/main.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ cifmw_test_operator_tobiko_default_conf:
3333
testcase:
3434
timeout: 1800.0
3535
test_runner_timeout: 14400.0
36-
ubuntu:
37-
interface_name: enp3s0
38-
customized_image_provided: "True"
36+
advanced_vm:
37+
username: fedora
3938
image_url: "{{ cifmw_test_operator_tobiko_advanced_image_url }}"
4039
keystone:
4140
interface: public

0 commit comments

Comments
 (0)