diff --git a/.github/workflows/sync-lightspeed-configs.yaml b/.github/workflows/sync-lightspeed-configs.yaml index 7040bb8da..d06f322aa 100644 --- a/.github/workflows/sync-lightspeed-configs.yaml +++ b/.github/workflows/sync-lightspeed-configs.yaml @@ -47,7 +47,12 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: Sync Lightspeed Core config files - run: ./hack/sync-lightspeed-configs.sh --ref ${{ matrix.branch }} + run: | + if [[ "${{ matrix.branch }}" == "release-1.10" ]]; then + ./hack/sync-lightspeed-configs.sh --repo redhat-ai-dev/lightspeed-configs --ref ${{ matrix.branch }} + else + ./hack/sync-lightspeed-configs.sh --ref ${{ matrix.branch }} + fi - name: Check for changes id: changes @@ -72,6 +77,11 @@ jobs: run: | TITLE="chore(lightspeed): sync config files from upstream" BRANCH="chore/sync-lightspeed-configs-${TARGET_BRANCH}" + TARGET_REPO="redhat-developer/rhdh-intelligent-assistant-configs" + + if [[ "${TARGET_BRANCH}" == "release-1.10" ]]; then + TARGET_REPO="redhat-ai-dev/lightspeed-configs" + fi EXISTING_PR=$(gh pr list --head "${BRANCH}" --base "${TARGET_BRANCH}" --state open --json number --jq '.[0].number // empty') @@ -91,7 +101,7 @@ jobs: git push origin "${BRANCH}" BODY=$(cat < [!NOTE] > This syncing functionality is intended for use by maintainers of the Intelligent Assistant flavour for RHDH. -The Intelligent Assistant flavour vendors configuration files from the upstream [`redhat-ai-dev/lightspeed-configs`](https://github.com/redhat-ai-dev/lightspeed-configs) repository. A sync script is provided to fetch the latest versions of these files and update the operator tree in place. +The Intelligent Assistant flavour vendors configuration files from the upstream [`redhat-developer/rhdh-intelligent-assistant-configs`](https://github.com/redhat-developer/rhdh-intelligent-assistant-configs) repository. A sync script is provided to fetch the latest versions of these files and update the operator tree in place. #### What Gets Synced diff --git a/hack/sync-lightspeed-configs.sh b/hack/sync-lightspeed-configs.sh index 7bfaf50cb..1a70a4884 100755 --- a/hack/sync-lightspeed-configs.sh +++ b/hack/sync-lightspeed-configs.sh @@ -5,7 +5,7 @@ set -euo pipefail -UPSTREAM_REPO="redhat-ai-dev/lightspeed-configs" +UPSTREAM_REPO="redhat-developer/rhdh-intelligent-assistant-configs" UPSTREAM_CONFIG_PATH="llama-stack-configs/config.yaml" UPSTREAM_STACK_PATH="lightspeed-core-configs/lightspeed-stack.yaml" UPSTREAM_PROFILE_PATH="lightspeed-core-configs/rhdh-profile.py" @@ -24,7 +24,7 @@ TMP_DIR="" usage() { cat <<'EOF' Usage: - ./hack/sync-lightspeed-configs.sh [--ref ] + ./hack/sync-lightspeed-configs.sh [--repo ] [--ref ] EOF } @@ -35,6 +35,10 @@ parse_args() { REF="$2" shift 2 ;; + --repo) + UPSTREAM_REPO="$2" + shift 2 + ;; -h|--help) usage exit 0