From d7e5d76dd4c79a2cbf28434c5245f2415bee552c Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Wed, 1 Dec 2021 11:23:29 +0100
Subject: [PATCH] .gitlab: Fix archusers playbook selection

Only run it for te required playbooks, exclude the phrik playbook as we
only need it to give demize access to phrik and only running archusers
removes demize from the phrik group. Seperate bug which should be
fixed...
---
 .gitlab/issue_templates/Offboarding.md | 2 +-
 .gitlab/issue_templates/Onboarding.md  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab/issue_templates/Offboarding.md b/.gitlab/issue_templates/Offboarding.md
index f96c8c090..833c491d3 100644
--- a/.gitlab/issue_templates/Offboarding.md
+++ b/.gitlab/issue_templates/Offboarding.md
@@ -23,7 +23,7 @@ This template should be used for offboarding Arch Linux team members.
 
 - [ ] Remove entry in `group_vars/all/archusers.yml`.
 - [ ] Remove SSH pubkey from `pubkeys/<username>.pub`.
-- [ ] Run `ansible-playbook -t archusers playbooks/*.yml`.
+- [ ] Run `ansible-playbook -t archusers  $(git grep -l archusers playbooks/ | grep -v phrik)`.
 - [ ] Remove the user from the `Trusted Users`/`Developers` groups on Keycloak.
 - [ ] Moderate email address on [arch-dev-public](https://lists.archlinux.org/admin/arch-dev-public/members) (find member and moderate)
 - [ ] Remove member from [arch-tu](https://lists.archlinux.org/admin/arch-tu/members) and/or [arch-dev](https://lists.archlinux.org/admin/arch-dev/members) mailing lists
diff --git a/.gitlab/issue_templates/Onboarding.md b/.gitlab/issue_templates/Onboarding.md
index f5495a83b..9eab81ca6 100644
--- a/.gitlab/issue_templates/Onboarding.md
+++ b/.gitlab/issue_templates/Onboarding.md
@@ -58,7 +58,7 @@ The mailing list password can be found in misc/additional-credentials.vault.
 
 - [ ] Add entry in `group_vars/all/archusers.yml`.
 - [ ] Add SSH pubkey to `pubkeys/<username>.pub`.
-- [ ] Run `ansible-playbook -t archusers playbooks/*.yml`.
+- [ ] Run `ansible-playbook -t archusers  $(git grep -l archusers playbooks/ | grep -v phrik)`.
 - [ ] Assign the user to the `Developers` groups on Keycloak.
 - [ ] Assign the user to the `Developers` group on [archlinux.org](https://archlinux.org/admin/auth/user/).
 - [ ] Subscribe **communication e-mail address** to internal [arch-dev](https://lists.archlinux.org/admin/arch-dev/members/add) mailing list.
@@ -68,7 +68,7 @@ The mailing list password can be found in misc/additional-credentials.vault.
 
 - [ ] Add entry in `group_vars/all/archusers.yml`.
 - [ ] Add SSH pubkey to `pubkeys/<username>.pub`.
-- [ ] Run `ansible-playbook -t archusers playbooks/*.yml`.
+- [ ] Run `ansible-playbook -t archusers  $(git grep -l archusers playbooks/ | grep -v phrik)`.
 - [ ] Assign the user to the `Trusted Users` groups on Keycloak.
 - [ ] Assign the user to the `Trusted Users` group on [archlinux.org](https://archlinux.org/admin/auth/user/).
 - [ ] Subscribe **communication e-mail address** to internal [arch-tu](https://lists.archlinux.org/admin/arch-tu/members/add) mailing list.
-- 
GitLab