Skip to content

Commit

Permalink
[zuul] Update the hook definitions
Browse files Browse the repository at this point in the history
ci-framework allows for hooks to be defined as multiple hooks in a list,
or single hooks in their own parameters.
If two separate vars files (passed to cifmw_extras) define the same
hook, then one gets overwritten by the other, depending on the order in
which the vars files are imported.

Using the "single hook in its own parameter" method of defining the hook
prevents this issue.
  • Loading branch information
elfiesmelfie committed Jun 14, 2024
1 parent d39accc commit e50c430
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions ci/vars-default-telemetry.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
---
post_ctlplane_deploy:
- name: Check default telemetry
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/check-default-telemetry.yml"
type: playbook
post_ctlplane_deploy_check_default_telemetry:
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/check-default-telemetry.yml"
type: playbook
cifmw_edpm_prepare_kustomizations:
- apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
Expand Down
7 changes: 3 additions & 4 deletions ci/vars-logging.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
---
pre_deploy:
- name: deploy_logging_dependencies
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/deploy-logging-dependencies.yml"
type: playbook
pre_deploy_deploy_logging_dependencies:
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/deploy-logging-dependencies.yml"
type: playbook
cifmw_edpm_prepare_kustomizations:
- apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
Expand Down

0 comments on commit e50c430

Please sign in to comment.