From e732a58f03023398f85194115104b26c25bbd385 Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Fri, 22 Jan 2021 19:42:39 +0000 Subject: [PATCH] Added tags to control execution of tasks * Added tag to zuul specific tasks, so that it can be skipped when running the playbooks in local setup or in a 3rd party gate Change-Id: If512eac4e0c5889a48e4aa98e357ca2ed1feefd8 Relates-To: #449 --- roles/airship-airshipctl-gather-configs/tasks/main.yaml | 3 ++- roles/airship-gather-apache-logs/tasks/main.yaml | 1 + roles/airship-gather-libvirt-logs/tasks/main.yaml | 1 + roles/airship-gather-pod-logs/tasks/main.yaml | 1 + roles/airship-gather-runtime-logs/tasks/main.yaml | 1 + roles/describe-kubernetes-objects/tasks/main.yaml | 1 + roles/gather-system-logs/tasks/main.yaml | 1 + tools/gate/99_collect_logs.sh | 2 +- 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/roles/airship-airshipctl-gather-configs/tasks/main.yaml b/roles/airship-airshipctl-gather-configs/tasks/main.yaml index 6b4711d0e..cb2396799 100644 --- a/roles/airship-airshipctl-gather-configs/tasks/main.yaml +++ b/roles/airship-airshipctl-gather-configs/tasks/main.yaml @@ -27,4 +27,5 @@ src: "{{ airshipctl_config_dir }}" dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" mode: pull - when: config_dir_stats.stat.exists \ No newline at end of file + when: config_dir_stats.stat.exists + tags: [zuul] diff --git a/roles/airship-gather-apache-logs/tasks/main.yaml b/roles/airship-gather-apache-logs/tasks/main.yaml index 9da31c7fd..83f731657 100644 --- a/roles/airship-gather-apache-logs/tasks/main.yaml +++ b/roles/airship-gather-apache-logs/tasks/main.yaml @@ -49,3 +49,4 @@ dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" mode: pull ignore_errors: True + tags: [zuul] diff --git a/roles/airship-gather-libvirt-logs/tasks/main.yaml b/roles/airship-gather-libvirt-logs/tasks/main.yaml index d157fb0d8..d906eb553 100644 --- a/roles/airship-gather-libvirt-logs/tasks/main.yaml +++ b/roles/airship-gather-libvirt-logs/tasks/main.yaml @@ -109,3 +109,4 @@ src: "{{ libvirt_log_dir }}" dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" mode: pull + tags: [zuul] diff --git a/roles/airship-gather-pod-logs/tasks/main.yaml b/roles/airship-gather-pod-logs/tasks/main.yaml index 59a58fa98..8562e470d 100644 --- a/roles/airship-gather-pod-logs/tasks/main.yaml +++ b/roles/airship-gather-pod-logs/tasks/main.yaml @@ -27,3 +27,4 @@ dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" mode: pull ignore_errors: True + tags: [zuul] diff --git a/roles/airship-gather-runtime-logs/tasks/main.yaml b/roles/airship-gather-runtime-logs/tasks/main.yaml index c13e33de9..f4e6e241a 100644 --- a/roles/airship-gather-runtime-logs/tasks/main.yaml +++ b/roles/airship-gather-runtime-logs/tasks/main.yaml @@ -43,3 +43,4 @@ src: "{{ runtime_logs_dir }}" dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" mode: pull + tags: [zuul] diff --git a/roles/describe-kubernetes-objects/tasks/main.yaml b/roles/describe-kubernetes-objects/tasks/main.yaml index 35256e89a..956e76481 100644 --- a/roles/describe-kubernetes-objects/tasks/main.yaml +++ b/roles/describe-kubernetes-objects/tasks/main.yaml @@ -81,4 +81,5 @@ dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" mode: pull ignore_errors: True + tags: [zuul] ... diff --git a/roles/gather-system-logs/tasks/main.yaml b/roles/gather-system-logs/tasks/main.yaml index 5c846ad83..31450ccc7 100644 --- a/roles/gather-system-logs/tasks/main.yaml +++ b/roles/gather-system-logs/tasks/main.yaml @@ -39,3 +39,4 @@ dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" mode: pull ignore_errors: True + tags: [zuul] diff --git a/tools/gate/99_collect_logs.sh b/tools/gate/99_collect_logs.sh index 3d42df1bd..f523dfbe3 100755 --- a/tools/gate/99_collect_logs.sh +++ b/tools/gate/99_collect_logs.sh @@ -25,4 +25,4 @@ PLAYBOOK_CONFIG=${PLAYBOOK_CONFIG:-"${TMP_DIR}/config.yaml"} sudo ansible-playbook -i "$ANSIBLE_HOSTS" \ playbooks/airship-collect-logs.yaml \ - -e @"$PLAYBOOK_CONFIG" + -e @"$PLAYBOOK_CONFIG" --skip-tags zuul