Move integration jobs to update_containers role

Depends-On: #1884 Signed-off-by: Chandan Kumar <raukadah@gmail.com>
openstack-k8s-operators · Jun 19, 2024 · c0670b6 · c0670b6
1 parent fcc4bea
commit c0670b6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/scenarios/centos-9/edpm_periodic.yml b/scenarios/centos-9/edpm_periodic.yml
@@ -1,14 +1,12 @@
 ---
 cifmw_repo_setup_branch: master
 cifmw_repo_setup_promotion: podified-ci-testing
-cifmw_set_openstack_containers_registry: quay.rdoproject.org
-cifmw_set_openstack_containers_tag_from_md5: true
-cifmw_set_openstack_containers_dlrn_md5_path: "{{ cifmw_basedir }}/artifacts/repositories/delorean.repo.md5"
-cifmw_edpm_prepare_update_os_containers: true
-cifmw_set_openstack_containers_namespace: "podified-master-centos9"
+cifmw_update_containers_registry: quay.rdoproject.org
+cifmw_update_containers_org: "podified-master-centos9"
+cifmw_update_containers_tag: "{{ cifmw_repo_setup_full_hash }}"
+cifmw_update_containers_openstack: true
 cifmw_run_tests: true
-cifmw_edpm_deploy_registry_url: "{{ cifmw_set_openstack_containers_registry }}/{{ cifmw_set_openstack_containers_namespace }}"
-cifmw_test_operator_tempest_registry: "{{ cifmw_set_openstack_containers_registry }}"
-cifmw_test_operator_tempest_namespace: "{{ cifmw_set_openstack_containers_namespace }}"
+cifmw_test_operator_tempest_registry: "{{ cifmw_update_containers_registry }}"
+cifmw_test_operator_tempest_namespace: "{{ cifmw_update_containers_org }}"
 cifmw_test_operator_tempest_image_tag: "{{ cifmw_repo_setup_full_hash }}"
 cifmw_update_containers_edpm_image_url: "quay.rdoproject.org/podified-{{cifmw_repo_setup_branch}}-centos9/edpm-hardened-uefi:{{ cifmw_repo_setup_full_hash }}"
diff --git a/zuul.d/edpm_periodic.yaml b/zuul.d/edpm_periodic.yaml
@@ -43,21 +43,21 @@
     parent: periodic-podified-edpm-deployment-master-ocp-crc-1cs9
     vars:
       cifmw_repo_setup_branch: antelope
-      cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
+      cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
 
 - job:
     name: periodic-podified-edpm-baremetal-antelope-ocp-crc
     parent: periodic-podified-edpm-baremetal-master-ocp-crc
     vars:
       cifmw_repo_setup_branch: antelope
-      cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
+      cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
 
 - job:
     name: periodic-podified-multinode-edpm-deployment-antelope-ocp-crc-cs9
     parent: periodic-podified-multinode-edpm-deployment-master-ocp-crc-cs9
     vars:
       cifmw_repo_setup_branch: antelope
-      cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
+      cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
 
 - job:
     name: periodic-edpm-build-push-images-centos-9-antelope

diff --git a/zuul.d/tempest_periodic.yaml b/zuul.d/tempest_periodic.yaml
@@ -26,4 +26,4 @@
     vars:
     # https://trunk.rdoproject.org/centos9-antelope/current-podified/delorean.repo
       cifmw_repo_setup_branch: antelope
-      cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
+      cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9