diff --git a/roles/test_operator/README.md b/roles/test_operator/README.md index fed1cc58c5..f081ec35ed 100644 --- a/roles/test_operator/README.md +++ b/roles/test_operator/README.md @@ -139,7 +139,7 @@ Default value: {} * `cifmw_test_operator_tobiko_pytest_addopts`: (String) `PYTEST_ADDOPTS` env variable with input pytest args. Example: `-m --maxfail --skipregex `. Defaults to `null`. In case of `null` value, `PYTEST_ADDOPTS` is not set (tobiko tests are executed without any extra pytest options). * `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). * `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). -* `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`. +* `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`. * `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` * `cifmw_test_operator_tobiko_openstack_cmd`: (String) Openstack command is used by tobiko to cleanup resources. Default value: `oc -n openstack exec openstackclient -- openstack` * `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 diff --git a/roles/test_operator/defaults/main.yml b/roles/test_operator/defaults/main.yml index 2b664340ad..01b906565a 100644 --- a/roles/test_operator/defaults/main.yml +++ b/roles/test_operator/defaults/main.yml @@ -183,7 +183,7 @@ cifmw_test_operator_tobiko_version: master cifmw_test_operator_tobiko_pytest_addopts: null cifmw_test_operator_tobiko_prevent_create: null cifmw_test_operator_tobiko_num_processes: null -cifmw_test_operator_tobiko_advanced_image_url: "https://softwarefactory-project.io/ubuntu-minimal-customized-enp3s0" +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" cifmw_test_operator_tobiko_override_conf: {} cifmw_test_operator_tobiko_kubeconfig_secret: tobiko-secret cifmw_test_operator_tobiko_openstack_cmd: 'oc -n openstack exec openstackclient -- openstack' diff --git a/roles/test_operator/vars/main.yml b/roles/test_operator/vars/main.yml index 20fb5d3537..ed8288041d 100644 --- a/roles/test_operator/vars/main.yml +++ b/roles/test_operator/vars/main.yml @@ -33,9 +33,8 @@ cifmw_test_operator_tobiko_default_conf: testcase: timeout: 1800.0 test_runner_timeout: 14400.0 - ubuntu: - interface_name: enp3s0 - customized_image_provided: "True" + advanced_vm: + username: fedora image_url: "{{ cifmw_test_operator_tobiko_advanced_image_url }}" keystone: interface: public