Skip to content

Commit 7ce69ef

Browse files
committed
Move integration jobs to update_containers role
Depends-On: #1884 Signed-off-by: Chandan Kumar <[email protected]>
1 parent 2ef6e09 commit 7ce69ef

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Diff for: scenarios/centos-9/edpm_periodic.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
---
22
cifmw_repo_setup_branch: master
33
cifmw_repo_setup_promotion: podified-ci-testing
4-
cifmw_set_openstack_containers_registry: quay.rdoproject.org
5-
cifmw_set_openstack_containers_tag_from_md5: true
6-
cifmw_set_openstack_containers_dlrn_md5_path: "{{ cifmw_basedir }}/artifacts/repositories/delorean.repo.md5"
7-
cifmw_edpm_prepare_update_os_containers: true
8-
cifmw_set_openstack_containers_namespace: "podified-master-centos9"
4+
cifmw_update_containers_registry: quay.rdoproject.org
5+
cifmw_update_containers_org: "podified-master-centos9"
6+
cifmw_update_containers_tag: "{{ cifmw_repo_setup_full_hash }}"
7+
cifmw_update_containers_openstack: true
98
cifmw_run_tests: true
10-
cifmw_edpm_deploy_registry_url: "{{ cifmw_set_openstack_containers_registry }}/{{ cifmw_set_openstack_containers_namespace }}"
11-
cifmw_test_operator_tempest_registry: "{{ cifmw_set_openstack_containers_registry }}"
12-
cifmw_test_operator_tempest_namespace: "{{ cifmw_set_openstack_containers_namespace }}"
9+
cifmw_test_operator_tempest_registry: "{{ cifmw_update_containers_registry }}"
10+
cifmw_test_operator_tempest_namespace: "{{ cifmw_update_containers_org }}"
1311
cifmw_test_operator_tempest_image_tag: "{{ cifmw_repo_setup_full_hash }}"
1412
cifmw_update_containers_edpm_image_url: "quay.rdoproject.org/podified-{{cifmw_repo_setup_branch}}-centos9/edpm-hardened-uefi:{{ cifmw_repo_setup_full_hash }}"

Diff for: zuul.d/edpm_periodic.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@
4343
parent: periodic-podified-edpm-deployment-master-ocp-crc-1cs9
4444
vars:
4545
cifmw_repo_setup_branch: antelope
46-
cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
46+
cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
4747

4848
- job:
4949
name: periodic-podified-edpm-baremetal-antelope-ocp-crc
5050
parent: periodic-podified-edpm-baremetal-master-ocp-crc
5151
vars:
5252
cifmw_repo_setup_branch: antelope
53-
cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
53+
cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
5454

5555
- job:
5656
name: periodic-podified-multinode-edpm-deployment-antelope-ocp-crc-cs9
5757
parent: periodic-podified-multinode-edpm-deployment-master-ocp-crc-cs9
5858
vars:
5959
cifmw_repo_setup_branch: antelope
60-
cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
60+
cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
6161

6262
- job:
6363
name: periodic-edpm-build-push-images-centos-9-antelope

0 commit comments

Comments
 (0)