Skip to content

Commit

Permalink
Move cifmw-crc-podified-edpm-baremetal back to crc-2-30
Browse files Browse the repository at this point in the history
Due to related issue, this moves the cifmw-crc-podified-edpm-baremetal
to centos-9-crc-2-30-0-6xlarge, which is a partial revert for [1]

Related: https://issues.redhat.com/browse/OSPCIX-336

[1] openstack-k8s-operators#1830
  • Loading branch information
marios committed Jun 20, 2024
1 parent db785d1 commit a1f6ae8
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 1 deletion.
2 changes: 1 addition & 1 deletion zuul.d/edpm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Virtual Baremetal job with CRC and single compute node.
- job:
name: cifmw-crc-podified-edpm-baremetal
nodeset: centos-9-crc-2-36-0-6xlarge
nodeset: centos-9-crc-2-30-0-6xlarge #TODO(marios) bump crc after OSPCIX-336
parent: cifmw-base-crc-openstack
run: ci/playbooks/edpm_baremetal_deployment/run.yml
vars:
Expand Down
76 changes: 76 additions & 0 deletions zuul.d/edpm_periodic.yaml.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
---
- job:
name: periodic-podified-edpm-deployment-master-ocp-crc-1cs9
parent: cifmw-crc-podified-edpm-deployment
vars: &edpm_vars
cifmw_repo_setup_branch: master
cifmw_repo_setup_promotion: podified-ci-testing
cifmw_dlrn_report_result: true
cifmw_extras:
- '@scenarios/centos-9/nested_virt.yml'
- '@scenarios/centos-9/edpm_periodic.yml'

- job:
name: periodic-podified-edpm-baremetal-master-ocp-crc
parent: cifmw-crc-podified-edpm-baremetal
vars: *edpm_vars

- job:
name: periodic-podified-multinode-edpm-deployment-master-ocp-crc-cs9
parent: podified-multinode-edpm-deployment-crc
vars: &edpm_multinode_vars
cifmw_repo_setup_branch: master
cifmw_repo_setup_promotion: podified-ci-testing
cifmw_dlrn_report_result: true
cifmw_extras:
- '@scenarios/centos-9/multinode-ci.yml'
- '@scenarios/centos-9/edpm_periodic.yml'

- job:
name: periodic-edpm-build-push-images-centos-9-master
parent: cifmw-base-edpm-build-images
vars:
cifmw_repo_setup_branch: master
cifmw_repo_setup_promotion: podified-ci-testing
openstack_release: master
cifmw_edpm_build_images_push_container_images: true
registry_login_enabled: true
cifmw_dlrn_report_result: true

# Antelope jobs
- job:
name: periodic-podified-edpm-deployment-antelope-ocp-crc-1cs9
parent: periodic-podified-edpm-deployment-master-ocp-crc-1cs9
vars:
cifmw_repo_setup_branch: antelope
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
<<<<<<< HEAD
cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9
=======
cifmw_set_openstack_containers_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9
cifmw_run_test_role: test_operator
cifmw_test_operator_edpm_ssh_key: "/home/zuul/ci-framework-data/artifacts/edpm/ansibleee-ssh-key-id_rsa"
cifmw_test_operator_tempest_include_list: |
tempest.scenario.test_server_basic_ops.TestServerBasicOps
>>>>>>> 6b05ab38 (Move periodic-podified-edpm-baremetal-antelope-ocp-crc to test-operator)

- 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_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9

- job:
name: periodic-edpm-build-push-images-centos-9-antelope
parent: periodic-edpm-build-push-images-centos-9-master
vars:
cifmw_repo_setup_branch: antelope
openstack_release: "{{ cifmw_repo_setup_branch }}"
cifmw_edpm_build_images_push_registry_namespace: "podified-{{ cifmw_repo_setup_branch }}-centos9"

0 comments on commit a1f6ae8

Please sign in to comment.