From 0863a9ac146418ddcea70bb30348b09337241d93 Mon Sep 17 00:00:00 2001
From: wtripp180901 <will.tripp@btinternet.com>
Date: Fri, 20 Dec 2024 14:52:04 +0000
Subject: [PATCH] fixed outdated var and moved fatimage to bumped branch

---
 .github/workflows/fatimage.yml          | 16 ++++++++++++++++
 .github/workflows/update-timestamps.yml |  4 ++--
 ansible/ci/update_timestamps.yml        |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
index f339249ea..f8e9d8923 100644
--- a/.github/workflows/fatimage.yml
+++ b/.github/workflows/fatimage.yml
@@ -15,6 +15,9 @@ on:
         ci_cloud:
           type: string
           default: LEAFCLOUD
+        branch:
+          type: string
+          default: "${{ github.ref }}"
       outputs:
         openhpc-RL8-image:
           description: "RL8 image"
@@ -51,7 +54,20 @@ jobs:
       openhpc-RL9-image: "${{ steps.manifest.outputs.openhpc-RL9-image }}"
 
     steps:
+
+      - name: Get current context
+        id: get_branch
+        run: |
+          if [[ ${{ github.event_name == 'workflow_dispatch' }} == true ]]; then
+            target_branch=${{ github.ref }}
+          else
+            target_branch=${{ github.event.inputs.branch }}
+          fi
+          echo "target_branch=$target_branch" >> "$GITHUB_OUTPUT"
+
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.get_branch.outputs.target_branch }}
 
       - name: Record settings for CI cloud
         run: |
diff --git a/.github/workflows/update-timestamps.yml b/.github/workflows/update-timestamps.yml
index 3b78edc9b..f835ff463 100644
--- a/.github/workflows/update-timestamps.yml
+++ b/.github/workflows/update-timestamps.yml
@@ -12,8 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with: #temporary
-          ref: feat/auto-bump-timestamps #temporary
 
       - name: Check for updated Ark timestamps and replace in defaults.yml
         run: |
@@ -45,6 +43,8 @@ jobs:
     if: "${{ needs.upstream_check.outputs.timestamps_changed }} == 0"
     needs: upstream_check
     uses: ./.github/workflows/fatimage.yml
+    with:
+      ci_cloud: LEAFCLOUD
 
   ci_and_pr:
     if: "${{ needs.upstream_check.outputs.timestamps_changed }} == 0"
diff --git a/ansible/ci/update_timestamps.yml b/ansible/ci/update_timestamps.yml
index b612531b3..c9ea78b1a 100644
--- a/ansible/ci/update_timestamps.yml
+++ b/ansible/ci/update_timestamps.yml
@@ -18,5 +18,5 @@
           {{ yaml_template | to_nice_yaml(indent=2) }}
     vars:
       yaml_template:
-        appliances_repo_timestamps: "{{ _result.latest_dict }}"
+        appliances_pulp_repos: "{{ _result.latest_dict }}"
     when: (_result.changed_timestamps | count) > 0