Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/sync-lightspeed-configs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
rm3l marked this conversation as resolved.

- name: Check for changes
id: changes
Expand All @@ -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')

Expand All @@ -91,7 +101,7 @@ jobs:
git push origin "${BRANCH}"

BODY=$(cat <<EOF
Automated nightly sync of Lightspeed Core config files from [redhat-ai-dev/lightspeed-configs @ ${TARGET_BRANCH}](https://github.com/redhat-ai-dev/lightspeed-configs/tree/${TARGET_BRANCH}).
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\`
Expand Down
2 changes: 1 addition & 1 deletion docs/intelligent-assistant.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ For more information about the Flavour-based configuration system, see the [Conf
> [!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

Expand Down
8 changes: 6 additions & 2 deletions hack/sync-lightspeed-configs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

set -euo pipefail

UPSTREAM_REPO="redhat-ai-dev/lightspeed-configs"
UPSTREAM_REPO="redhat-developer/rhdh-intelligent-assistant-configs"
Comment thread
rm3l marked this conversation as resolved.
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"
Expand All @@ -24,7 +24,7 @@ TMP_DIR=""
usage() {
cat <<'EOF'
Usage:
./hack/sync-lightspeed-configs.sh [--ref <branch-or-tag>]
./hack/sync-lightspeed-configs.sh [--repo <repo>] [--ref <branch-or-tag>]
EOF
}

Expand All @@ -35,6 +35,10 @@ parse_args() {
REF="$2"
shift 2
;;
--repo)
UPSTREAM_REPO="$2"
shift 2
;;
-h|--help)
usage
exit 0
Expand Down