Skip to content

Commit

Permalink
Merge branch 'master' into efoley-zuul-crc-no-nested-virt
Browse files Browse the repository at this point in the history
  • Loading branch information
elfiesmelfie authored Jan 9, 2024
2 parents 9944614 + c008c6e commit 86fae49
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
17 changes: 17 additions & 0 deletions build/stf-collect-logs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,20 @@
ignore_errors: true
retries: 3
delay: 10

- name: "Get PV and PVC information details"
ansible.builtin.shell:
cmd: |
oc -n {{ namespace }} get pv >> {{ logfile_dir }}/post_pv.log 2>&1
oc -n {{ namespace }} get pvc >> {{ logfile_dir }}/post_pvc.log 2>&1
ignore_errors: true

- name: "Get SGO,STO and QDR logs"
ansible.builtin.shell:
cmd: |
oc -n {{ namespace }} logs $(oc -n {{ namespace }} get pod -l name=service-telemetry-operator -o jsonpath='{.items[].metadata.name}') >> {{ logfile_dir }}/logs_sto.log 2>&1
oc -n {{ namespace }} logs $(oc -n {{ namespace }} get pod -l app=smart-gateway-operator -o jsonpath='{.items[].metadata.name}') >> {{ logfile_dir }}/logs_sgo.log 2>&1
oc -n {{ namespace }} logs $(oc -n {{ namespace }} get pod -l qdr -o jsonpath='{.items[].metadata.name}') >> {{ logfile_dir }}/logs_qdr.log 2>&1
ignore_errors: true
retries: 3
delay: 10
3 changes: 1 addition & 2 deletions ci/vars-local_build-index_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
#ansible-playbook --extra-vars __local_build_enabled=true -e __deploy_from_index_enabled=true --extra-vars working_branch="$(git rev-parse --abbrev-ref HEAD)" --extra-vars __service_telemetry_storage_ephemeral_enabled=true --extra-vars __service_telemetry_observability_strategy=use_redhat ./run-ci.yaml
#ansible-playbook --extra-vars __local_build_enabled=true -e __deploy_from_index_enabled=true --extra-vars working_branch="$(git rev-parse --abbrev-ref HEAD)" --extra-vars __service_telemetry_observability_strategy=use_redhat ./run-ci.yaml
__local_build_enabled: true
__deploy_from_index_enabled: true
__service_telemetry_ephemeral_enabled: true
__service_telemetry_observability_strategy: use_redhat
1 change: 0 additions & 1 deletion ci/vars-local_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
__deploy_stf: true
__local_build_enabled: true
__service_telemetry_snmptraps_enabled: true
__service_telemetry_storage_ephemeral_enabled: true
1 change: 0 additions & 1 deletion ci/vars-nightly_bundles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

__local_build_enabled: false
__deploy_from_bundles_enabled: true
__service_telemetry_storage_ephemeral_enabled: true
1 change: 1 addition & 0 deletions ci/vars-zuul-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sgo_dir: "{{ ansible_env.HOME }}/{{ zuul.projects['github.com/infrawatch/smart-g
sg_core_dir: "{{ ansible_env.HOME }}/{{ zuul.projects['github.com/infrawatch/sg-core'].src_dir }}"
sg_bridge_dir: "{{ ansible_env.HOME }}/{{ zuul.projects['github.com/infrawatch/sg-bridge'].src_dir }}"
prometheus_webhook_snmp_dir: "{{ ansible_env.HOME }}/{{ zuul.projects['github.com/infrawatch/prometheus-webhook-snmp'].src_dir }}"
__service_telemetry_storage_persistent_storage_class: "crc-csi-hostpath-provisioner"

0 comments on commit 86fae49

Please sign in to comment.