Skip to content

Commit bc7e6c7

Browse files
committed
Use make openstack_wait in kuttl test playbook
We're installing openstack operator using 'make openstack' and waiting for the subscription and installplan, but due to a recent change to the CRDs [1], we need to also wait for the csv before proceeding. Using 'make openstack_wait' from install_yamls should fix the issue, as done in [2]. [1] openstack-k8s-operators/openstack-operator#1185 [2] openshift/release#60702 Related-Issue: #OSPRH-11244
1 parent 84ac038 commit bc7e6c7

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

ci/playbooks/kuttl/deploy-deps.yaml

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -89,35 +89,15 @@
8989
ignore_errors: true
9090
register: openstack_operator_subscription
9191

92-
- name: Install openstack operator
92+
- name: Install openstack operator and wait for the csv to succeed
9393
when: openstack_operator_subscription.stdout == ""
9494
vars:
95-
make_openstack_env: "{{ cifmw_edpm_prepare_common_env |
95+
make_openstack_init_env: "{{ cifmw_edpm_prepare_common_env |
9696
combine(cifmw_edpm_prepare_make_openstack_env) }}"
97-
make_openstack_dryrun: "{{ cifmw_edpm_prepare_dry_run }}"
97+
make_openstack_init_dryrun: "{{ cifmw_edpm_prepare_dry_run }}"
9898
ansible.builtin.include_role:
9999
name: 'install_yamls_makes'
100-
tasks_from: 'make_openstack'
101-
102-
- name: Wait for OpenStack subscription creation
103-
when: openstack_operator_subscription.stdout == ""
104-
ansible.builtin.command:
105-
cmd: >-
106-
oc get sub openstack-operator
107-
--namespace=openstack-operators
108-
-o=jsonpath='{.status.installplan.name}'
109-
register: cifmw_edpm_prepare_wait_installplan_out
110-
until: cifmw_edpm_prepare_wait_installplan_out.rc == 0 and cifmw_edpm_prepare_wait_installplan_out.stdout != ""
111-
retries: 30
112-
delay: 10
113-
114-
- name: Wait for OpenStack operator to get installed
115-
when: openstack_operator_subscription.stdout == ""
116-
ansible.builtin.command:
117-
cmd: >-
118-
oc wait InstallPlan {{ cifmw_edpm_prepare_wait_installplan_out.stdout }}
119-
--namespace=openstack-operators
120-
--for=jsonpath='{.status.phase}'=Complete --timeout=20m
100+
tasks_from: 'make_openstack_init'
121101

122102
- name: install kuttl test_suite dependencies
123103
vars:

0 commit comments

Comments
 (0)