From c5df7f2cd60ca9efcafcdf63f0cf88c7e3c9b042 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Wed, 29 Jan 2020 13:12:37 -0500 Subject: [PATCH] Integration tests: differentiate labels for different pipelines zuul.change isn't available in the post and periodic pipelines so we shouldn't try to include it. We're splitting this into a different file so we can add more things later. Change-Id: I53a257aafba395e07afc0a1755e26cab28c1b2f0 --- tests/basic.yaml | 10 ++-------- tests/test_tasks.yaml | 10 ++-------- tests/zuul_metadata.yaml | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 tests/zuul_metadata.yaml diff --git a/tests/basic.yaml b/tests/basic.yaml index d5778f8d..b25e824b 100644 --- a/tests/basic.yaml +++ b/tests/basic.yaml @@ -89,14 +89,8 @@ command: "{{ ara_api_venv_path }}/bin/python -m ara.setup.plugins" register: ara_setup_plugins - - name: Set default labels with Zuul - set_fact: - _default_labels: - - "nodepool.provider:{{ nodepool.provider }}" - - "zuul.change:{{ zuul.change }}" - - "zuul.executor:{{ zuul.executor.hostname }}" - - "zuul.pipeline:{{ zuul.pipeline }}" - - "zuul.project:{{ zuul.project.canonical_name }}" + - name: Record Zuul metadata for ARA playbooks + include_tasks: zuul_metadata.yaml when: zuul is defined - name: Template an ansible.cfg file diff --git a/tests/test_tasks.yaml b/tests/test_tasks.yaml index df56b396..541fd808 100644 --- a/tests/test_tasks.yaml +++ b/tests/test_tasks.yaml @@ -63,14 +63,8 @@ changed_when: false register: ara_setup_plugins -- name: Set default labels with Zuul - set_fact: - _default_labels: - - "nodepool.provider:{{ nodepool.provider }}" - - "zuul.change:{{ zuul.change }}" - - "zuul.executor:{{ zuul.executor.hostname }}" - - "zuul.pipeline:{{ zuul.pipeline }}" - - "zuul.project:{{ zuul.project.canonical_name }}" +- name: Record Zuul metadata for ARA playbooks + include_tasks: zuul_metadata.yaml when: zuul is defined # These aren't in the same task (i.e, with loop) so we can tell individual test diff --git a/tests/zuul_metadata.yaml b/tests/zuul_metadata.yaml new file mode 100644 index 00000000..d2427dc2 --- /dev/null +++ b/tests/zuul_metadata.yaml @@ -0,0 +1,24 @@ +- name: Set default labels for check, gate and promote pipelines + set_fact: + _default_labels: + - "nodepool.provider:{{ nodepool.provider }}" + - "zuul.change:{{ zuul.change }}" + - "zuul.executor:{{ zuul.executor.hostname }}" + - "zuul.job:{{ zuul.job }}" + - "zuul.pipeline:{{ zuul.pipeline }}" + - "zuul.project:{{ zuul.project.canonical_name }}" + when: + - zuul.pipeline is defined + - zuul.pipeline in ["check", "gate", "promote"] + +- name: Set default labels for periodic and post pipelines + set_fact: + _default_labels: + - "nodepool.provider:{{ nodepool.provider }}" + - "zuul.executor:{{ zuul.executor.hostname }}" + - "zuul.job:{{ zuul.job }}" + - "zuul.pipeline:{{ zuul.pipeline }}" + - "zuul.project:{{ zuul.project.canonical_name }}" + when: + - zuul.pipeline is defined + - zuul.pipeline in ["periodic", "post"]