From 0decccc4fa18ebabb8265cc6b930fdc9e3a86f7b Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 28 Jul 2023 12:09:44 +0200
Subject: [PATCH] Refactor conditional for sssd testing (#22053)

---
 .github/actions/conditional/conditions | 6 +++---
 .github/workflows/ci.yml               | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/actions/conditional/conditions b/.github/actions/conditional/conditions
index 2fa81af4449..98eaf40ff51 100644
--- a/.github/actions/conditional/conditions
+++ b/.github/actions/conditional/conditions
@@ -2,9 +2,9 @@
 #
 # To test a pattern run '.github/actions/conditional/conditional.sh <remote name> <branch>'
 
-.github/actions/                            ci operator js codeql-java codeql-themes guides documentation sssd
+.github/actions/                            ci operator js codeql-java codeql-themes guides documentation ci-sssd
 
-.github/workflows/ci.yml                    ci sssd
+.github/workflows/ci.yml                    ci ci-sssd
 .github/workflows/operator-ci.yml           operator
 .github/workflows/js-ci.yml                 js
 .github/workflows/codeql-analysis.yml       codeql-java codeql-themes
@@ -14,7 +14,7 @@
 */src/main/                                 ci operator
 */src/test/                                 ci operator
 pom.xml                                     ci operator
-federation/sssd/                            ci sssd
+federation/sssd/                            ci ci-sssd
 
 docs/guides/                                guides
 docs/documentation/                         documentation
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4463140def6..e3766bc76dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -500,28 +500,25 @@ jobs:
   sssd-unit-tests:
     name: SSSD
     runs-on: ubuntu-latest
+    if: needs.conditional.outputs.sssd == 'true'
     needs:
       - conditional
       - build
     timeout-minutes: 30
     steps:
       - name: checkout
-        if: ${{ needs.conditional.outputs.sssd == 'true' }}
         uses: actions/checkout@v3
 
       - id: integration-test-setup
-        if: ${{ needs.conditional.outputs.sssd == 'true' }}
         name: Integration test setup
         uses: ./.github/actions/integration-test-setup
 
       - id: weekly-cache-key
-        if: ${{ needs.conditional.outputs.sssd == 'true' }}
         name: Key for weekly rotation of cache
         shell: bash
         run: echo "key=ipa-data-`date -u "+%Y-%U"`" >> $GITHUB_OUTPUT
 
       - id: cache-maven-repository
-        if: ${{ needs.conditional.outputs.sssd == 'true' }}
         name: ipa-data cache
         uses: actions/cache@v3
         with:
@@ -529,7 +526,6 @@ jobs:
           key: ${{ steps.weekly-cache-key.outputs.key }}
 
       - name: Run tests
-        if: ${{ needs.conditional.outputs.sssd == 'true' }}
         run: .github/scripts/run-ipa.sh "${{ github.workspace }}"
 
   migration-tests: