From 729ae5f549022f7d567bb4893899cf627db1e401 Mon Sep 17 00:00:00 2001
From: Jordan Dubrick <jdubrick@redhat.com>
Date: Mon, 5 Oct 2026 13:43:09 -0400
Subject: [PATCH] ci: support release-2.1 in Lightspeed config sync

---
 .../workflows/sync-lightspeed-configs.yaml    | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/sync-lightspeed-configs.yaml b/.github/workflows/sync-lightspeed-configs.yaml
index d06f322aa..680a8a599 100644
--- a/.github/workflows/sync-lightspeed-configs.yaml
+++ b/.github/workflows/sync-lightspeed-configs.yaml
@@ -15,6 +15,7 @@ jobs:
       matrix:
         branch:
           - release-1.10
+          - release-2.1
 
     concurrency:
       group: ${{ github.workflow }}-${{ matrix.branch }}
@@ -46,18 +47,18 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-      - name: Sync Lightspeed Core config files
+      - name: Sync Lightspeed Core config files and check for changes
+        id: changes
         run: |
+          ./hack/sync-lightspeed-configs.sh --ref ${{ matrix.branch }}
+
           if [[ "${{ matrix.branch }}" == "release-1.10" ]]; then
-            ./hack/sync-lightspeed-configs.sh --repo redhat-ai-dev/lightspeed-configs --ref ${{ matrix.branch }}
+            CHANGE_PATHS=(config/profile/rhdh/default-config/flavours/lightspeed/ examples/lightspeed.yaml)
           else
-            ./hack/sync-lightspeed-configs.sh --ref ${{ matrix.branch }}
+            CHANGE_PATHS=(config/profile/rhdh/default-config/flavours/intelligent-assistant/ config/profile/rhdh/default-config/flavours/intelligent-assistant-okp/ examples/intelligent-assistant.yaml)
           fi
 
-      - name: Check for changes
-        id: changes
-        run: |
-          if git diff --quiet config/profile/rhdh/default-config/flavours/intelligent-assistant/ examples/intelligent-assistant.yaml; then
+          if git diff --quiet -- "${CHANGE_PATHS[@]}"; then
             echo "No changes from upstream."
             echo "has_changes=false" >> "$GITHUB_OUTPUT"
           else
@@ -81,6 +82,14 @@ jobs:
           
           if [[ "${TARGET_BRANCH}" == "release-1.10" ]]; then
             TARGET_REPO="redhat-ai-dev/lightspeed-configs"
+            SYNCED_FILES=$(printf '%s\n' \
+              '- `config/profile/rhdh/default-config/flavours/lightspeed/configmap-files.yaml`' \
+              '- `examples/lightspeed.yaml`')
+          else
+            SYNCED_FILES=$(printf '%s\n' \
+              '- `config/profile/rhdh/default-config/flavours/intelligent-assistant/configmap-files.yaml`' \
+              '- `config/profile/rhdh/default-config/flavours/intelligent-assistant-okp/configmap-files.yaml`' \
+              '- `examples/intelligent-assistant.yaml`')
           fi
 
           EXISTING_PR=$(gh pr list --head "${BRANCH}" --base "${TARGET_BRANCH}" --state open --json number --jq '.[0].number // empty')
@@ -104,8 +113,7 @@ jobs:
           Automated nightly sync of Lightspeed Core config files from [${TARGET_REPO} @ ${TARGET_BRANCH}](https://github.com/${TARGET_REPO}/tree/${TARGET_BRANCH}).
 
           ### Synced files
-          - \`config/profile/rhdh/default-config/flavours/intelligent-assistant/configmap-files.yaml\`
-          - \`examples/intelligent-assistant.yaml\`
+          ${SYNCED_FILES}
 
           > [!CAUTION]
           > Please review the upstream changes carefully before merging.