Skip to content

Commit 0200782

Browse files
eduolivaresbrjackma
authored andcommitted
[whitebox_neutron_tempest_jobs] fix update_containers values
Values of `cifmw_update_containers_registry`, `cifmw_update_containers_org` and `cifmw_update_containers_tag` were not properly updated when the job received values for `content_provider_os_registry_url` and `content_provider_dlrn_md5_hash`, creating wrong OpenstackVersion CR. This patch fixes that issue. Signed-off-by: Eduardo Olivares <eolivare@redhat.com>
1 parent db4bf16 commit 0200782

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

zuul.d/whitebox_neutron_tempest_jobs.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@
1919
cifmw_test_operator_timeout: 14400
2020
cifmw_block_device_size: 40G
2121
cifmw_repo_setup_branch: antelope
22-
cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
23-
cifmw_update_containers_registry: quay.rdoproject.org
24-
cifmw_update_containers_tag: "{{ cifmw_repo_setup_full_hash }}"
25-
cifmw_test_operator_tempest_concurrency: 6
26-
cifmw_test_operator_tempest_network_attachments:
27-
- ctlplane
28-
cifmw_test_operator_tempest_container: openstack-tempest-all
29-
cifmw_test_operator_tempest_registry: >-
22+
cifmw_update_containers_registry: >-
3023
{{
3124
content_provider_os_registry_url | default('') | split('/') | first
3225
if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null'
33-
else cifmw_update_containers_registry
26+
else 'quay.rdoproject.org'
3427
}}
35-
cifmw_test_operator_tempest_namespace: >-
28+
cifmw_update_containers_org: >-
3629
{{
3730
content_provider_os_registry_url | default('') | split('/') | last
3831
if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null'
39-
else cifmw_update_containers_org
32+
else 'podified-' + cifmw_repo_setup_branch + '-centos9'
4033
}}
41-
cifmw_test_operator_tempest_image_tag: "{{ content_provider_dlrn_md5_hash | default(cifmw_repo_setup_full_hash) }}"
34+
cifmw_update_containers_tag: "{{ content_provider_dlrn_md5_hash | default(cifmw_repo_setup_full_hash) }}"
35+
cifmw_test_operator_tempest_concurrency: 6
36+
cifmw_test_operator_tempest_network_attachments:
37+
- ctlplane
38+
cifmw_test_operator_tempest_container: openstack-tempest-all
39+
cifmw_test_operator_tempest_registry: "{{ cifmw_update_containers_registry }}"
40+
cifmw_test_operator_tempest_namespace: "{{ cifmw_update_containers_org }}"
41+
cifmw_test_operator_tempest_image_tag: "{{ cifmw_update_containers_tag }}"
4242
cifmw_test_operator_tempest_extra_images:
4343
- URL: "https://github.com/openstack-k8s-operators/openstack-k8s-operators-ci/releases/download/v1.0.0/wntp-custom-v1.0.0.qcow2"
4444
name: custom_neutron_guest

0 commit comments

Comments
 (0)