From e50c43062930649e60361fbf7ab0985c9e99f642 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 14 Jun 2024 13:57:55 -0400 Subject: [PATCH] [zuul] Update the hook definitions 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. --- ci/vars-default-telemetry.yml | 7 +++---- ci/vars-logging.yml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ci/vars-default-telemetry.yml b/ci/vars-default-telemetry.yml index 78957c0c..8f512f64 100644 --- a/ci/vars-default-telemetry.yml +++ b/ci/vars-default-telemetry.yml @@ -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 diff --git a/ci/vars-logging.yml b/ci/vars-logging.yml index 5222fd9a..b1cedb74 100644 --- a/ci/vars-logging.yml +++ b/ci/vars-logging.yml @@ -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