From b62203973cad900e51885aab3ffcaef40f514b04 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 27 Mar 2024 09:18:23 +0000
Subject: [PATCH] Always print out the list of jobs to run

---
 .github/workflows/ci.yml                     | 6 +-----
 .github/workflows/nightly.yml                | 6 +-----
 .github/workflows/scheduled.yml              | 6 +-----
 .github/workflows/staging.yml                | 6 +-----
 .github/workflows/templates/layout.yml.jinja | 6 +-----
 tools/ci.py                                  | 7 ++++++-
 6 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4765edb40d5..05f3b003960 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -202,15 +202,11 @@ jobs:
         run: |
           echo '${{ steps.runner-types.outputs.runners }}' | jq -C '.'
 
-      - name: Define Jobs
+      - name: Define Jobs To Run
         id: define-jobs
         run: |
           tools ci define-jobs ${{ github.event_name }} changed-files.json
 
-      - name: Check Defined Jobs
-        run: |
-          echo '${{ steps.define-jobs.outputs.jobs }}' | jq -C '.'
-
       - name: Get Salt Releases
         id: get-salt-releases
         env:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1ff3ccb7db5..2055c3cf41f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -246,15 +246,11 @@ jobs:
         run: |
           echo '${{ steps.runner-types.outputs.runners }}' | jq -C '.'
 
-      - name: Define Jobs
+      - name: Define Jobs To Run
         id: define-jobs
         run: |
           tools ci define-jobs${{ inputs.skip-salt-test-suite && ' --skip-tests' || '' }}${{ inputs.skip-salt-pkg-test-suite && ' --skip-pkg-tests' || '' }} ${{ github.event_name }} changed-files.json
 
-      - name: Check Defined Jobs
-        run: |
-          echo '${{ steps.define-jobs.outputs.jobs }}' | jq -C '.'
-
       - name: Get Salt Releases
         id: get-salt-releases
         env:
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index 524ffc4613b..584bdc3739e 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -236,15 +236,11 @@ jobs:
         run: |
           echo '${{ steps.runner-types.outputs.runners }}' | jq -C '.'
 
-      - name: Define Jobs
+      - name: Define Jobs To Run
         id: define-jobs
         run: |
           tools ci define-jobs ${{ github.event_name }} changed-files.json
 
-      - name: Check Defined Jobs
-        run: |
-          echo '${{ steps.define-jobs.outputs.jobs }}' | jq -C '.'
-
       - name: Get Salt Releases
         id: get-salt-releases
         env:
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 3812b70ea9e..bf66b82a99f 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -241,15 +241,11 @@ jobs:
         run: |
           echo '${{ steps.runner-types.outputs.runners }}' | jq -C '.'
 
-      - name: Define Jobs
+      - name: Define Jobs To Run
         id: define-jobs
         run: |
           tools ci define-jobs${{ inputs.skip-salt-test-suite && ' --skip-tests' || '' }}${{ inputs.skip-salt-pkg-test-suite && ' --skip-pkg-tests' || '' }}${{ inputs.skip-salt-pkg-download-test-suite && ' --skip-pkg-download-tests' || '' }} ${{ github.event_name }} changed-files.json
 
-      - name: Check Defined Jobs
-        run: |
-          echo '${{ steps.define-jobs.outputs.jobs }}' | jq -C '.'
-
       - name: Get Salt Releases
         id: get-salt-releases
         env:
diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja
index 211828c4386..5bc899f9902 100644
--- a/.github/workflows/templates/layout.yml.jinja
+++ b/.github/workflows/templates/layout.yml.jinja
@@ -264,17 +264,13 @@ jobs:
         run: |
           echo '${{ steps.runner-types.outputs.runners }}' | jq -C '.'
 
-      - name: Define Jobs
+      - name: Define Jobs To Run
         id: define-jobs
         run: |
           tools ci define-jobs<{ prepare_workflow_skip_test_suite }><{
             prepare_workflow_skip_pkg_test_suite }><{ prepare_workflow_skip_pkg_download_test_suite
           }> ${{ github.event_name }} changed-files.json
 
-      - name: Check Defined Jobs
-        run: |
-          echo '${{ steps.define-jobs.outputs.jobs }}' | jq -C '.'
-
       - name: Get Salt Releases
         id: get-salt-releases
         env:
diff --git a/tools/ci.py b/tools/ci.py
index e470fd666d0..c9e516f8bd8 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -311,6 +311,11 @@ def define_jobs(
 
     if event_name != "pull_request":
         # In this case, all defined jobs should run
+        with open(github_step_summary, "a", encoding="utf-8") as wfh:
+            wfh.write("Selected Jobs:\n")
+            for name, value in sorted(jobs.items()):
+                wfh.write(f" - `{name}`: {value}\n")
+
         ctx.info("Writing 'jobs' to the github outputs file")
         with open(github_output, "a", encoding="utf-8") as wfh:
             wfh.write(f"jobs={json.dumps(jobs)}\n")
@@ -422,7 +427,7 @@ def define_jobs(
     with open(github_step_summary, "a", encoding="utf-8") as wfh:
         wfh.write("Selected Jobs:\n")
         for name, value in sorted(jobs.items()):
-            wfh.write(f" - {name}: {value}\n")
+            wfh.write(f" - `{name}`: {value}\n")
 
     ctx.info("Writing 'jobs' to the github outputs file")
     with open(github_output, "a", encoding="utf-8") as wfh: