From 084c0eed35d335aa3a7a1f539185327aa48451f1 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Wed, 24 Dec 2025 11:04:56 +0100 Subject: [PATCH 1/3] [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 dcb61ddefeb0bff8442cfc188d69027028f78062 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Thu, 8 Jan 2026 16:36:18 +0100 Subject: [PATCH 2/3] Run wntp job when its zuul file is changed Add whitebox-neutron-tempest-plugin-podified-multinode-edpm-deployment-crc-2comp to the github-check pipeline and run the job when file zuul.d/whitebox_neutron_tempest_jobs.yaml changes. Signed-off-by: Eduardo Olivares --- ci/templates/projects.yaml | 1 + zuul.d/projects.yaml | 1 + zuul.d/whitebox_neutron_tempest_jobs.yaml | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/templates/projects.yaml b/ci/templates/projects.yaml index 75ae430ae8..6e3f19e8f2 100644 --- a/ci/templates/projects.yaml +++ b/ci/templates/projects.yaml @@ -21,4 +21,5 @@ - cifmw-tcib - cifmw-architecture-validate-hci - ci-framework-openstack-meta-content-provider + - whitebox-neutron-tempest-plugin-podified-multinode-edpm-deployment-crc-2comp # Start generated content diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index b51fad17f0..097b4aed39 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -12,6 +12,7 @@ - cifmw-tcib - cifmw-architecture-validate-hci - ci-framework-openstack-meta-content-provider + - whitebox-neutron-tempest-plugin-podified-multinode-edpm-deployment-crc-2comp - cifmw-molecule-adoption_osp_deploy - cifmw-molecule-artifacts - cifmw-molecule-build_containers diff --git a/zuul.d/whitebox_neutron_tempest_jobs.yaml b/zuul.d/whitebox_neutron_tempest_jobs.yaml index 84465d83ec..0f86bc10d5 100644 --- a/zuul.d/whitebox_neutron_tempest_jobs.yaml +++ b/zuul.d/whitebox_neutron_tempest_jobs.yaml @@ -7,12 +7,15 @@ parent: podified-multinode-edpm-deployment-crc-2comp nodeset: centos-9-2x-centos-9-xxl-crc-cloud-ocp-4-18-1-xxl timeout: 12600 - override-checkout: main description: | A multinode EDPM Zuul job which one controller, one extracted crc and 2 computes. This job will run with meta content provider to test whitebox-neutron-tempest-plugin opendev patches. It will validate the deployment by running whitebox-neutron-tempest-plugin tests. + files: + - ^zuul.d/whitebox_neutron_tempest_jobs.yaml + dependencies: + - openstack-k8s-operators-content-provider vars: cifmw_run_test_role: test_operator cifmw_os_must_gather_timeout: "30m" From 768cbb95a5f4a33892f49ca54f6d2bde1d78e2ac Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Fri, 9 Jan 2026 12:30:32 +0100 Subject: [PATCH 3/3] [test_operator] Set default values for runners vars This fixes a bug where variables defined only in defaults/main.yml (like cifmw_test_operator_tempest_config) were not included in stage_vars_dict because lookup('vars', ...) doesn't find variables at the defaults precedence level. Assisted-By: Claude (claude-sonnet-4.5) Signed-off-by: Eduardo Olivares --- roles/test_operator/tasks/runners/tempest_runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/test_operator/tasks/runners/tempest_runner.yml b/roles/test_operator/tasks/runners/tempest_runner.yml index 1385b0fa9a..811b237544 100644 --- a/roles/test_operator/tasks/runners/tempest_runner.yml +++ b/roles/test_operator/tasks/runners/tempest_runner.yml @@ -2,7 +2,7 @@ - name: Run tempest job vars: run_test_fw: tempest - test_operator_config: "{{ stage_vars_dict.cifmw_test_operator_tempest_config }}" + test_operator_config: "{{ stage_vars_dict.cifmw_test_operator_tempest_config | default(cifmw_test_operator_tempest_config) }}" test_operator_instance_name: "{{ stage_vars_dict.cifmw_test_operator_tempest_name }}-{{ _stage_vars.name }}" test_operator_kind_name: "{{ stage_vars_dict.cifmw_test_operator_tempest_kind_name }}" test_operator_crd_name: "{{ stage_vars_dict.cifmw_test_operator_tempest_crd_name }}"