From 58b08b7df385cfd36a494240b73fd81fa3882da5 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Wed, 24 Dec 2025 11:04:56 +0100 Subject: [PATCH 1/2] [wntp] Use customized image created with github actions workflow Depends-On: https://github.com/openstack-k8s-operators/openstack-k8s-operators-ci/pull/157 OSPRH-23929 Signed-off-by: Eduardo Olivares --- zuul.d/whitebox_neutron_tempest_jobs.yaml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/zuul.d/whitebox_neutron_tempest_jobs.yaml b/zuul.d/whitebox_neutron_tempest_jobs.yaml index 4e5b442e0c..84465d83ec 100644 --- a/zuul.d/whitebox_neutron_tempest_jobs.yaml +++ b/zuul.d/whitebox_neutron_tempest_jobs.yaml @@ -15,19 +15,28 @@ deployment by running whitebox-neutron-tempest-plugin tests. vars: cifmw_run_test_role: test_operator - cifmw_os_must_gather_timeout: 28800 + cifmw_os_must_gather_timeout: "30m" cifmw_test_operator_timeout: 14400 cifmw_block_device_size: 40G cifmw_test_operator_tempest_concurrency: 6 cifmw_test_operator_tempest_network_attachments: - ctlplane cifmw_test_operator_tempest_container: openstack-tempest-all - cifmw_test_operator_tempest_registry: "{{ content_provider_os_registry_url | split('/') | first }}" - cifmw_test_operator_tempest_namespace: "{{ content_provider_os_registry_url | split('/') | last }}" - cifmw_test_operator_tempest_image_tag: "{{ content_provider_dlrn_md5_hash }}" + cifmw_test_operator_tempest_registry: >- + {{ + content_provider_os_registry_url | split('/') | first + if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' + else omit + }} + cifmw_test_operator_tempest_namespace: >- + {{ + content_provider_os_registry_url | split('/') | last + if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' + else omit + }} + cifmw_test_operator_tempest_image_tag: "{{ content_provider_dlrn_md5_hash | default(omit) }}" cifmw_test_operator_tempest_extra_images: - # TODO(chandan): Replace rocky qcow2 url once rhos-ops hosts it - - URL: "https://chandankumar.fedorapeople.org/rocky9_latest_neutron_whitebox.qcow2" + - URL: "https://github.com/eduolivares/openstack-k8s-operators-ci/releases/download/v1.0.0-beta/wntp-custom-v1.0.0-beta.qcow2" name: custom_neutron_guest diskFormat: qcow2 ID: "11111111-1111-1111-1111-111111111111" From 3078e6cbfc2f23f61505a7287bb5292a1e5b97a9 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Thu, 8 Jan 2026 13:44:10 +0100 Subject: [PATCH 2/2] [test_operator] Skip type config override when value is undefined Refactors the "Override specific type config" task to skip execution when neither _stage_test_vars nor the global variable lookup provide a defined value. Introduces _stage_config_value variable to avoid duplicating the lookup logic in both the when condition and set_fact operation. Assisted-By: Claude Code/claude-4.5-sonnet --- roles/test_operator/tasks/stages.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/test_operator/tasks/stages.yml b/roles/test_operator/tasks/stages.yml index 675018677a..1c35a14d50 100644 --- a/roles/test_operator/tasks/stages.yml +++ b/roles/test_operator/tasks/stages.yml @@ -37,8 +37,10 @@ - name: Override specific type config vars: _stage_config: 'cifmw_test_operator_{{ _stage_vars.type }}_config' + _stage_config_value: "{{ _stage_test_vars[_stage_config] | default(lookup('vars', _stage_config, default=None)) }}" + when: _stage_config_value is not none ansible.builtin.set_fact: - stage_vars_dict: "{{ stage_vars_dict | combine({_stage_config: _stage_test_vars[_stage_config] | default(lookup('vars', _stage_config, default=omit)) }) }}" + stage_vars_dict: "{{ stage_vars_dict | combine({_stage_config: _stage_config_value}) }}" - name: "Call runner {{ _stage_vars.type }}" ansible.builtin.include_tasks: "runners/{{ _stage_vars.type }}_runner.yml"