Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
cifmw_test_operator_tempest_external_plugin:
- repository: "https://opendev.org/openstack/watcher-tempest-plugin.git"
changeRepository: "https://review.opendev.org/openstack/watcher-tempest-plugin"
changeRefspec: "380572db57798530b64dcac14c6b01b0382c5d8e"
changeRefspec: "924551f526a40ed9328e0ff0a5d71acff9145950"
watcher_scenario: "edpm-no-notifications"

- job:
Expand Down
23 changes: 1 addition & 22 deletions ci/playbooks/deploy_cluster_observability_operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,13 @@
namespace: openshift-operators
spec:
channel: stable
installPlanApproval: Manual
startingCSV: cluster-observability-operator.v1.3.1
installPlanApproval: Automatic
name: cluster-observability-operator
source: redhat-operators
sourceNamespace: openshift-marketplace
EOF
register: output

- name: Get and approve the installplan when the version is pinned
block:
- name: Get the installplan from the coo subscription
ansible.builtin.shell:
cmd: |
oc get installplan -n {{ _namespace }} | grep "cluster-observability-operator.v1.3.1" | awk '{print $1}'
retries: 15
delay: 20
register: coo_installplan
until: coo_installplan.stdout_lines | length != 0

- name: Show the coo_installplan from oc get installplan
ansible.builtin.debug:
var: coo_installplan

- name: Approve the installation
ansible.builtin.shell:
cmd: |
oc patch -n {{ _namespace }} installplan {{ coo_installplan.stdout }} --type='json' -p='[{"op": "replace", "path": "/spec/approved", "value":true}]'

# need to have a wait here, since the csv is not created immediately. There is a slight delay, during which time, the oc wait command would fail, since there's no resource to watch
- name: Wait for the required resource to be created
ansible.builtin.command:
Expand Down
1 change: 1 addition & 0 deletions ci/tests/watcher-tempest-nfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ cifmw_test_operator_tempest_tempestconf_config:
optimize.prometheus_host metric-storage-prometheus.openstack.svc
optimize.prometheus_ssl_enabled true
optimize.prometheus_ssl_cert_dir /etc/prometheus/secrets/combined-ca-bundle
optimize.prometheus_write_path /
optimize.podified_kubeconfig_path /home/zuul/.crc/machines/crc/kubeconfig
optimize.podified_namespace openstack
optimize.run_continuous_audit_tests true
Expand Down
1 change: 1 addition & 0 deletions ci/tests/watcher-tempest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ cifmw_test_operator_tempest_tempestconf_config:
optimize.prometheus_host metric-storage-prometheus.openstack.svc
optimize.prometheus_ssl_enabled true
optimize.prometheus_ssl_cert_dir /etc/prometheus/secrets/combined-ca-bundle
optimize.prometheus_write_path /
optimize.podified_kubeconfig_path /home/zuul/.crc/machines/crc/kubeconfig
optimize.podified_namespace openstack
optimize.run_continuous_audit_tests true
Expand Down
Loading