From 141f30793b907afcd0fd5657129f2c3fb8a12c1d Mon Sep 17 00:00:00 2001 From: rabi Date: Thu, 2 Oct 2025 11:15:16 +0530 Subject: [PATCH] Add periodic bootc jobs Also use cifmw_update_containers_edpm_image_url to patch openstackversion CR. We can also remove BAREMETAL_OS_IMG var when we use the same qcow image name for bootc images. Signed-off-by: rabi --- roles/edpm_deploy_baremetal/tasks/main.yml | 2 ++ zuul.d/edpm.yaml | 5 ++++- zuul.d/edpm_periodic.yaml | 19 ++++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/roles/edpm_deploy_baremetal/tasks/main.yml b/roles/edpm_deploy_baremetal/tasks/main.yml index e67a7f654f..d51cca1977 100644 --- a/roles/edpm_deploy_baremetal/tasks/main.yml +++ b/roles/edpm_deploy_baremetal/tasks/main.yml @@ -120,6 +120,7 @@ target_path: "{{ cifmw_edpm_deploy_openstack_crs_path }}" sort_ascending: false kustomizations: |- + {% if content_provider_registry_ip is defined or not cifmw_edpm_deploy_baremetal_bootc %} apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization patches: @@ -137,6 +138,7 @@ path: /spec/nodeTemplate/ansible/ansibleVars/edpm_bootstrap_command value: sudo dnf -y update {% endif %} + {% endif %} kustomizations_paths: >- {{ [ diff --git a/zuul.d/edpm.yaml b/zuul.d/edpm.yaml index 8b65d21f38..dcd9cf514d 100644 --- a/zuul.d/edpm.yaml +++ b/zuul.d/edpm.yaml @@ -31,10 +31,13 @@ crc_parameters: "--memory 32000 --disk-size 240 --cpus 12" cifmw_manage_secrets_pullsecret_content: '{}' cifmw_rhol_crc_binary_folder: "/usr/local/bin" + # This needs to be updated later to not use hardcoded image url but the one pushed by + # the periodic job for pushing the bootc images to the registry + cifmw_update_containers_edpm_image_url: quay.io/openstack-k8s-operators/edpm-bootc:latest-qcow2 cifmw_install_yamls_vars: - BAREMETAL_OS_CONTAINER_IMG: quay.io/openstack-k8s-operators/edpm-bootc:latest-qcow2 BAREMETAL_OS_IMG: edpm-bootc.qcow2 cifmw_edpm_deploy_baremetal_bootc: true + cifmw_update_containers: true # Podified galera job - job: diff --git a/zuul.d/edpm_periodic.yaml b/zuul.d/edpm_periodic.yaml index c9bf9db7ed..dbba5e6a98 100644 --- a/zuul.d/edpm_periodic.yaml +++ b/zuul.d/edpm_periodic.yaml @@ -20,7 +20,6 @@ cifmw_tempest_container: openstack-tempest-all cifmw_tempest_image_tag: "{{ cifmw_repo_setup_full_hash }}" - - job: name: periodic-podified-multinode-edpm-deployment-master-ocp-crc-cs9 parent: podified-multinode-edpm-deployment-crc @@ -59,6 +58,24 @@ cifmw_update_containers_org: podified-{{ cifmw_repo_setup_branch }}-centos9 cifmw_tempest_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9 +- job: + name: periodic-podified-edpm-baremetal-bootc-antelope-ocp-crc + parent: cifmw-crc-podified-edpm-baremetal-bootc + vars: + cifmw_repo_setup_branch: antelope + cifmw_repo_setup_promotion: podified-ci-testing + cifmw_dlrn_report_result: true + cifmw_tempest_registry: quay.rdoproject.org + cifmw_tempest_namespace: podified-{{ cifmw_repo_setup_branch }}-centos9 + cifmw_tempest_container: openstack-tempest-all + cifmw_tempest_image_tag: "{{ cifmw_repo_setup_full_hash }}" + cifmw_update_containers_registry: quay.rdoproject.org + cifmw_update_containers_org: "podified-{{ cifmw_repo_setup_branch }}-centos9" + cifmw_update_containers_tag: "{{ cifmw_repo_setup_full_hash }}" + cifmw_update_containers_openstack: true + cifmw_extras: + - '@scenarios/centos-9/nested_virt.yml' + - job: name: periodic-podified-multinode-edpm-deployment-antelope-ocp-crc-cs9 parent: periodic-podified-multinode-edpm-deployment-master-ocp-crc-cs9