Skip to content

Commit

Permalink
Merge pull request #472 from openstack-k8s-operators/logs/load-hooks-env
Browse files Browse the repository at this point in the history
Early load hooks env in logs playbook
  • Loading branch information
openshift-merge-robot authored Aug 24, 2023
2 parents 54d80e3 + 54610a2 commit 8c5c79a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
10 changes: 3 additions & 7 deletions ci_framework/roles/artifacts/tasks/edpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,10 @@
ansible.builtin.include_vars:
file: /etc/ci/env/networking-info.yml

- name: Load generated hook env file for SSH key
ansible.builtin.include_vars:
dir: "{{ cifmw_artifacts_basedir }}/artifacts"
depth: 1
files_matching: '^(pre|post).*\.yml$'

- name: Extract Compute from zuul mapping if any
when: crc_ci_bootstrap_networks_out is defined
when:
- crc_ci_bootstrap_networks_out is defined
- cifmw_edpm_deploy_extra_vars
ansible.builtin.set_fact:
ssh_key_file: "{{ cifmw_edpm_deploy_extra_vars.SSH_KEY_FILE }}"
edpm_vms: >-
Expand Down
7 changes: 7 additions & 0 deletions ci_framework/roles/artifacts/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
path: "{{ cifmw_artifacts_basedir }}/artifacts"
state: directory

- name: Load generated hook environment for further usage
ansible.builtin.include_vars:
dir: "{{ cifmw_artifacts_basedir }}/artifacts"
depth: 1
files_matching: '^(pre|post).*\.yml$'
ignore_errors: true

- name: Gather environment data
tags:
- always
Expand Down

0 comments on commit 8c5c79a

Please sign in to comment.