Skip to content

Commit de9a2e7

Browse files
rabirabi
committed
[edpm_prepare] Add new job to run minor update with baremetal deployment
Adds a new baremetal job to test minor update with upstream github content. This will currently test from fr3->main(with PR). Signed-off-by: rabi <[email protected]>
1 parent 84c46b6 commit de9a2e7

File tree

5 files changed

+330
-3
lines changed

5 files changed

+330
-3
lines changed

‎ci/playbooks/edpm_baremetal_update/run.yml‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
---
2+
- name: "Run ci/playbooks/edpm_baremetal_update/run.yml"
3+
hosts: "{{ cifmw_zuul_target_host | default('all') }}"
4+
gather_facts: true
5+
tasks:
6+
- name: Filter out host if needed
7+
when:
8+
- cifmw_zuul_target_host is defined
9+
- cifmw_zuul_target_host != 'all'
10+
- inventory_hostname != cifmw_zuul_target_host
11+
ansible.builtin.meta: end_host
12+
13+
- name: Check for edpm-ansible.yml file
14+
ansible.builtin.stat:
15+
path: "{{ ansible_user_dir }}/ci-framework-data/artifacts/edpm-ansible.yml"
16+
register: edpm_file
17+
18+
- name: Check if new ssh keypair exists
19+
ansible.builtin.include_role:
20+
name: recognize_ssh_keypair
21+
22+
- name: Add crc node in local inventory
23+
ansible.builtin.add_host:
24+
name: crc
25+
ansible_ssh_private_key_file: "{{ ansible_user_dir }}/.crc/machines/crc/{{ crc_ssh_keypair }}"
26+
ansible_ssh_user: core
27+
ansible_host: api.crc.testing
28+
29+
- name: Ensure we know ssh hosts
30+
ansible.builtin.shell:
31+
cmd: "ssh-keyscan {{ hostvars[item].ansible_host }} >> ~/.ssh/known_hosts"
32+
loop: "{{ hostvars.keys() | reject('equalto', 'localhost') }}"
33+
34+
- name: Inject CRC in zuul_inventory
35+
block:
36+
- name: Load zuul_inventory
37+
register: _inventory
38+
ansible.builtin.slurp:
39+
path: "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
40+
41+
- name: Inject CRC in zuul_inventory.yml
42+
vars:
43+
_crc:
44+
all:
45+
hosts:
46+
crc: "{{ dict(hostvars.crc) }}"
47+
_updated: >-
48+
{{
49+
_inventory.content | b64decode | from_yaml | combine(_crc, recursive=true)
50+
}}
51+
ansible.builtin.copy:
52+
dest: "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
53+
content: "{{ _updated | to_nice_yaml }}"
54+
mode: "0644"
55+
56+
- name: Set default pre-update tag if not provided
57+
ansible.builtin.set_fact:
58+
cifmw_minor_update_pre_update_tag: "{{ cifmw_minor_update_pre_update_tag | default('18.0-fr4-latest') }}"
59+
60+
- name: Get pre-update index image digest from tag
61+
ansible.builtin.shell: >-
62+
skopeo inspect
63+
docker://quay.io/openstack-k8s-operators/openstack-operator-index:{{ cifmw_minor_update_pre_update_tag }}
64+
| jq -r '.Digest'
65+
register: fr4_digest_result
66+
changed_when: false
67+
failed_when: fr4_digest_result.rc != 0
68+
69+
- name: Set FR4 index image using digest from tag
70+
ansible.builtin.set_fact:
71+
cifmw_minor_update_fr4_index_image: >-
72+
quay.io/openstack-k8s-operators/openstack-operator-index@{{ fr4_digest_result.stdout | trim }}
73+
74+
- name: Get minor update index image from content provider or use default
75+
ansible.builtin.set_fact:
76+
cifmw_minor_update_index_image: >-
77+
{{
78+
cifmw_operator_build_output.operators['openstack-operator'].image_catalog
79+
if (cifmw_operator_build_output is defined and
80+
cifmw_operator_build_output.operators is defined and
81+
'openstack-operator' in cifmw_operator_build_output.operators)
82+
else cifmw_minor_update_fr4_index_image
83+
}}
84+
85+
- name: Override operator build output with FR4 index image for Phase 1
86+
ansible.builtin.set_fact:
87+
cifmw_operator_build_output_fr4: >-
88+
{{
89+
{
90+
'cifmw_operator_build_output': {
91+
'operators': {
92+
'openstack-operator': {
93+
'image_catalog': cifmw_minor_update_fr4_index_image
94+
}
95+
}
96+
}
97+
}
98+
}}
99+
100+
- name: Phase 1 - Deploy with FR4 index image using deploy-edpm.yml
101+
block:
102+
- name: Write FR4 operator build output to temporary file
103+
ansible.builtin.copy:
104+
dest: "{{ ansible_user_dir }}/ci-framework-data/artifacts/operator_build_output_fr4.yml"
105+
content: "{{ cifmw_operator_build_output_fr4 | to_nice_yaml }}"
106+
mode: "0644"
107+
108+
- name: Perform Podified and EDPM deployment on compute nodes with virtual baremetal (FR4)
109+
ansible.builtin.command:
110+
chdir: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework"
111+
cmd: >-
112+
ansible-playbook deploy-edpm.yml
113+
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
114+
-e @group_vars/all.yml
115+
-e @scenarios/centos-9/base.yml
116+
-e @scenarios/centos-9/edpm_baremetal_deployment_ci.yml
117+
{%- if edpm_file.stat.exists %}
118+
-e @{{ ansible_user_dir }}/ci-framework-data/artifacts/edpm-ansible.yml
119+
{%- endif %}
120+
{%- if cifmw_extras is defined %}
121+
{%- for extra_var in cifmw_extras %}
122+
-e "{{ extra_var }}"
123+
{%- endfor %}
124+
{%- endif %}
125+
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml"
126+
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/operator_build_output_fr4.yml"
127+
-e "cifmw_prepare_openstackversion=false"
128+
129+
# Load install_yamls environment from parameters file created by deploy-edpm.yml bootstrap
130+
# deploy-edpm.yml runs on target host, so files are on target host
131+
# Use slurp to read from target host, then parse with from_yaml
132+
- name: Read install-yamls-params.yml file from target host
133+
ansible.builtin.slurp:
134+
src: "{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/install-yamls-params.yml"
135+
register: install_yamls_params_content
136+
when: cifmw_install_yamls_environment is not defined
137+
138+
- name: Load install_yamls environment from parameters file
139+
ansible.builtin.set_fact:
140+
cifmw_install_yamls_environment: "{{ (install_yamls_params_content.content | b64decode | from_yaml)['cifmw_install_yamls_environment'] | default({}) }}"
141+
cifmw_install_yamls_defaults: "{{ (install_yamls_params_content.content | b64decode | from_yaml)['cifmw_install_yamls_defaults'] | default({}) }}"
142+
when:
143+
- cifmw_install_yamls_environment is not defined
144+
- install_yamls_params_content.content is defined
145+
146+
- name: Set install_yamls environment for minor update phase
147+
ansible.builtin.set_fact:
148+
cifmw_minor_update_env: >-
149+
{{
150+
(cifmw_install_yamls_environment | default({})) |
151+
combine({'PATH': cifmw_path | default(ansible_user_dir ~ '/.crc/bin:' ~ ansible_user_dir ~ '/.crc/bin/oc:' ~ ansible_user_dir ~ '/bin:' ~ ansible_env.PATH)}) |
152+
combine({'OPENSTACK_IMG': cifmw_minor_update_index_image}) |
153+
combine({'BMO_CLEANUP': false})
154+
}}
155+
156+
# Phase 2: Run update playbook in same execution context as deploy-edpm.yml
157+
# This allows it to use install_yamls_makes role that was generated during Phase 1 bootstrap
158+
- name: Phase 2 - Update with index image for minor update
159+
block:
160+
- name: Write minor update environment to temporary file
161+
ansible.builtin.copy:
162+
dest: "{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/minor_update_env.yml"
163+
content: "{{ {'cifmw_minor_update_env': cifmw_minor_update_env} | to_nice_yaml }}"
164+
mode: "0644"
165+
166+
- name: Run Phase 2 update playbook for minor update
167+
ansible.builtin.command:
168+
chdir: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework"
169+
cmd: >-
170+
ansible-playbook ci/playbooks/edpm_baremetal_update/update.yml
171+
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
172+
-e @group_vars/all.yml
173+
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml"
174+
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/minor_update_env.yml"

‎ci/playbooks/edpm_baremetal_update/update.yml‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
---
2+
# Phase 2: Update with index image for minor update
3+
# This playbook runs in the same execution context as deploy-edpm.yml,
4+
# so it can use install_yamls_makes role that was generated during bootstrap
5+
- name: Phase 2 - Update with index image for minor update
6+
hosts: "{{ cifmw_zuul_target_host | default('all') }}"
7+
gather_facts: false
8+
tasks:
9+
- name: Filter out host if needed
10+
when:
11+
- cifmw_zuul_target_host is defined
12+
- cifmw_zuul_target_host != 'all'
13+
- inventory_hostname != cifmw_zuul_target_host
14+
ansible.builtin.meta: end_host
15+
16+
- name: Set cifmw_basedir if not defined
17+
ansible.builtin.set_fact:
18+
cifmw_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
19+
20+
- name: Load parameters files
21+
ansible.builtin.include_vars:
22+
dir: "{{ cifmw_basedir }}/artifacts/parameters"
23+
24+
- name: Run make openstack_cleanup
25+
vars:
26+
make_openstack_cleanup_env: "{{ cifmw_minor_update_env }}"
27+
make_openstack_cleanup_dryrun: false
28+
ansible.builtin.include_role:
29+
name: 'install_yamls_makes'
30+
tasks_from: 'make_openstack_cleanup'
31+
ignore_errors: true # Continue even if cleanup fails
32+
33+
- name: Run make openstack_wait (minor update)
34+
vars:
35+
make_openstack_wait_env: "{{ cifmw_minor_update_env }}"
36+
make_openstack_wait_dryrun: false
37+
ansible.builtin.include_role:
38+
name: 'install_yamls_makes'
39+
tasks_from: 'make_openstack_wait'
40+
41+
- name: Run make openstack_init (minor update)
42+
vars:
43+
make_openstack_init_env: "{{ cifmw_minor_update_env }}"
44+
make_openstack_init_dryrun: false
45+
ansible.builtin.include_role:
46+
name: 'install_yamls_makes'
47+
tasks_from: 'make_openstack_init'
48+
49+
- name: Wait for availableVersion to be different from deployedVersion
50+
kubernetes.core.k8s_info:
51+
kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
52+
api_key: "{{ cifmw_openshift_token | default(omit) }}"
53+
context: "{{ cifmw_openshift_context | default(omit) }}"
54+
api_version: core.openstack.org/v1beta1
55+
kind: OpenStackVersion
56+
namespace: "{{ cifmw_install_yamls_defaults['NAMESPACE'] | default('openstack') }}"
57+
register: openstackversion_wait_info
58+
retries: 10
59+
delay: 60
60+
until: >
61+
openstackversion_wait_info.resources is defined and
62+
openstackversion_wait_info.resources | length > 0 and
63+
openstackversion_wait_info.resources[0].status.availableVersion is defined and
64+
openstackversion_wait_info.resources[0].status.deployedVersion is defined and
65+
openstackversion_wait_info.resources[0].status.availableVersion != openstackversion_wait_info.resources[0].status.deployedVersion
66+
67+
- name: Get available version from OpenStackVersion CR
68+
ansible.builtin.set_fact:
69+
cifmw_minor_update_target_version: "{{ openstackversion_wait_info.resources[0].status.availableVersion }}"
70+
71+
- name: Patch OpenStackVersion CR availableVersion
72+
vars:
73+
make_openstack_patch_version_env: "{{ cifmw_minor_update_env }}"
74+
make_openstack_patch_version_dryrun: false
75+
ansible.builtin.include_role:
76+
name: 'install_yamls_makes'
77+
tasks_from: 'make_openstack_patch_version'
78+
79+
- name: Set vars related to update_containers content provider
80+
when:
81+
- content_provider_os_registry_url is defined
82+
- content_provider_os_registry_url != 'null'
83+
ansible.builtin.set_fact:
84+
cifmw_update_containers_registry: "{{ content_provider_os_registry_url | split('/') | first }}"
85+
cifmw_update_containers_org: "{{ content_provider_os_registry_url | split('/') | last }}"
86+
cifmw_update_containers_tag: "{{ content_provider_dlrn_md5_hash }}"
87+
cifmw_update_containers_openstack: true
88+
89+
- name: Prepare and patch OpenStackVersion CR for update
90+
vars:
91+
cifmw_update_containers_metadata: "controlplane"
92+
cifmw_update_containers: true
93+
ansible.builtin.include_role:
94+
name: update_containers
95+
when: >-
96+
(cifmw_update_containers_edpm_image_url is defined and
97+
cifmw_update_containers_openstack is defined and
98+
cifmw_update_containers_openstack | bool) or
99+
(cifmw_update_containers_ansibleee_image_url is defined) or
100+
(cifmw_update_containers_openstack is defined and
101+
cifmw_update_containers_openstack | bool) or
102+
(cifmw_update_containers_watcher is defined and
103+
cifmw_update_containers_watcher | bool)
104+
105+
- name: Run make openstack_update_run
106+
vars:
107+
make_openstack_update_run_env: "{{ cifmw_minor_update_env }}"
108+
make_openstack_update_run_params:
109+
OPENSTACK_VERSION: "{{ cifmw_minor_update_target_version }}"
110+
make_openstack_update_run_dryrun: false
111+
ansible.builtin.include_role:
112+
name: 'install_yamls_makes'
113+
tasks_from: 'make_openstack_update_run'
114+
115+
- name: Verify deployed version matches target version
116+
kubernetes.core.k8s_info:
117+
kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
118+
api_key: "{{ cifmw_openshift_token | default(omit) }}"
119+
context: "{{ cifmw_openshift_context | default(omit) }}"
120+
api_version: core.openstack.org/v1beta1
121+
kind: OpenStackVersion
122+
namespace: "{{ cifmw_install_yamls_defaults['NAMESPACE'] | default('openstack') }}"
123+
register: openstackversion_verify_info
124+
until: >
125+
openstackversion_verify_info.resources is defined and
126+
openstackversion_verify_info.resources | length > 0 and
127+
openstackversion_verify_info.resources[0].status.deployedVersion is defined and
128+
openstackversion_verify_info.resources[0].status.deployedVersion == cifmw_minor_update_target_version
129+
retries: 5
130+
delay: 2
131+
132+
- name: Display update verification result
133+
ansible.builtin.debug:
134+
msg: >-
135+
Update verification successful: Target version {{ cifmw_minor_update_target_version }}
136+
matches deployed version {{ openstackversion_verify_info.resources[0].status.deployedVersion }}

‎roles/edpm_prepare/tasks/kustomize_and_deploy.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@
2626
cifmw_update_containers_registry: "{{ content_provider_os_registry_url | split('/') | first }}"
2727
cifmw_update_containers_org: "{{ content_provider_os_registry_url | split('/') | last }}"
2828
cifmw_update_containers_tag: "{{ content_provider_dlrn_md5_hash }}"
29-
cifmw_update_containers_openstack: true
29+
cifmw_update_containers_openstack: "{{ cifmw_edpm_prepare_update_containers | default(true) }}"
3030

3131
- name: Prepare OpenStackVersion CR
3232
when: >-
33-
(cifmw_update_containers_edpm_image_url is defined and
33+
(cifmw_prepare_openstackversion | default(true) | bool) and
34+
((cifmw_update_containers_edpm_image_url is defined and
3435
cifmw_update_containers_openstack is defined and
3536
cifmw_update_containers_openstack | bool) or
3637
(cifmw_update_containers_ansibleee_image_url is defined) or
3738
(cifmw_update_containers_openstack is defined and
3839
cifmw_update_containers_openstack | bool) or
3940
(cifmw_update_containers_watcher is defined and
40-
cifmw_update_containers_watcher | bool)
41+
cifmw_update_containers_watcher | bool))
4142
vars:
4243
cifmw_update_containers_metadata: "{{ _ctlplane_name }}"
4344
ansible.builtin.include_role:

‎zuul.d/edpm.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@
3939
cifmw_edpm_deploy_baremetal_bootc: true
4040
cifmw_update_containers: true
4141

42+
# Virtual Baremetal job with CRC for minor update testing.
43+
# First deploys with FR4 index image, then updates with PR index image.
44+
- job:
45+
name: cifmw-crc-podified-edpm-baremetal-minor-update
46+
nodeset: centos-9-crc-2-48-0-6xlarge
47+
parent: cifmw-base-crc-openstack
48+
run: ci/playbooks/edpm_baremetal_update/run.yml
49+
dependencies:
50+
- openstack-k8s-operators-content-provider
51+
vars:
52+
crc_parameters: "--memory 32000 --disk-size 240 --cpus 12"
53+
cifmw_manage_secrets_pullsecret_content: '{}'
54+
cifmw_rhol_crc_binary_folder: "/usr/local/bin"
55+
cifmw_minor_update_pre_update_tag: "18.0-fr3-latest"
56+
4257
# Podified galera job
4358
- job:
4459
name: cifmw-crc-podified-galera-deployment

‎zuul.d/project-templates.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
- cifmw-molecule
6060
- podified-multinode-edpm-deployment-crc: *content_provider
6161
- cifmw-crc-podified-edpm-baremetal: *content_provider
62+
- cifmw-crc-podified-edpm-baremetal-minor-update: *content_provider
6263
- podified-multinode-hci-deployment-crc: *content_provider
6364
- cifmw-multinode-tempest: *content_provider
6465
- cifmw-pod-zuul-files

0 commit comments

Comments
 (0)