Skip to content

Commit 5d5df7c

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into feat/bruno-crud-tests
2 parents 664aed2 + 1e422ad commit 5d5df7c

5 files changed

Lines changed: 40 additions & 32 deletions

File tree

‎.github/workflows/redhat-distro-container.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
143143
- name: Validate provider credentials
144144
env:
145-
_MAAS_VLLM_URL: ${{ secrets.MAAS_VLLM_URL }}
145+
_MAAS_VLLM_URL: ${{ vars.LITEMAAS_URL }}
146146
run: |
147147
# Fork/Dependabot PRs: secrets are unavailable
148148
if [ "${{ github.event_name }}" = "pull_request" ]; then
@@ -205,10 +205,12 @@ jobs:
205205
206206
- name: Configure MaaS vLLM endpoints
207207
env:
208-
_MAAS_VLLM_URL: ${{ secrets.MAAS_VLLM_URL }}
209-
_MAAS_VLLM_API_TOKEN: ${{ secrets.MAAS_VLLM_API_TOKEN }}
210-
_MAAS_EMBEDDING_URL: ${{ secrets.MAAS_EMBEDDING_URL }}
211-
_MAAS_EMBEDDING_API_TOKEN: ${{ secrets.MAAS_EMBEDDING_API_TOKEN }}
208+
_MAAS_VLLM_URL: ${{ vars.LITEMAAS_URL }}
209+
_MAAS_VLLM_API_TOKEN: ${{ secrets.LITEMAAS_API_KEY }}
210+
_MAAS_EMBEDDING_URL: ${{ vars.LITEMAAS_URL }}
211+
_MAAS_EMBEDDING_API_TOKEN: ${{ secrets.LITEMAAS_API_KEY }}
212+
_MAAS_INFERENCE_MODEL: ${{ vars.LITEMAAS_INFERENCE_MODEL }}
213+
_MAAS_EMBEDDING_MODEL: ${{ vars.LITEMAAS_EMBEDDING_MODEL }}
212214
run: |
213215
if [ -z "$_MAAS_VLLM_URL" ]; then
214216
echo "MaaS vLLM URL not configured, skipping"
@@ -218,12 +220,12 @@ jobs:
218220
{
219221
echo "VLLM_URL=$_MAAS_VLLM_URL"
220222
echo "VLLM_API_TOKEN=$_MAAS_VLLM_API_TOKEN"
221-
echo "VLLM_INFERENCE_MODEL=vllm-inference/llama-3-2-3b"
223+
echo "VLLM_INFERENCE_MODEL=vllm-inference/$_MAAS_INFERENCE_MODEL"
222224
echo "VLLM_EMBEDDING_URL=$_MAAS_EMBEDDING_URL"
223225
echo "VLLM_EMBEDDING_API_TOKEN=$_MAAS_EMBEDDING_API_TOKEN"
224-
echo "EMBEDDING_MODEL=vllm-embedding/nomic-embed-text-v1-5"
226+
echo "EMBEDDING_MODEL=vllm-embedding/$_MAAS_EMBEDDING_MODEL"
225227
echo "EMBEDDING_PROVIDER=vllm-embedding"
226-
echo "EMBEDDING_PROVIDER_MODEL_ID=nomic-embed-text-v1-5"
228+
echo "EMBEDDING_PROVIDER_MODEL_ID=$_MAAS_EMBEDDING_MODEL"
227229
echo "USING_MAAS=true"
228230
} >> "$GITHUB_ENV"
229231

‎.github/workflows/responses-vllm-maas.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222

2323
env:
2424
PROVIDER_NAME: vllm-maas
25-
EMBEDDING_MODEL: vllm-embedding/Nomic-embed-text-v2-moe
25+
EMBEDDING_MODEL: vllm-embedding/${{ vars.LITEMAAS_EMBEDDING_MODEL }}
2626
IMAGE_NAME: quay.io/opendatahub/odh-ogx-core
2727
IMAGE_TAG: ${{ inputs.image_tag || 'source-b5c18de28794baaf537b2683271a5043ccd42426-6515a120edf38a477a55b037e745752f2535661c' }}
2828

@@ -36,8 +36,8 @@ jobs:
3636
- name: Check MaaS credentials
3737
id: check
3838
env:
39-
MAAS_VLLM_URL: ${{ secrets.MAAS_VLLM_URL }}
40-
MAAS_VLLM_API_TOKEN: ${{ secrets.MAAS_VLLM_API_TOKEN }}
39+
MAAS_VLLM_URL: ${{ vars.LITEMAAS_URL }}
40+
MAAS_VLLM_API_TOKEN: ${{ secrets.LITEMAAS_API_KEY }}
4141
run: |
4242
if [ -z "$MAAS_VLLM_URL" ] || [ -z "$MAAS_VLLM_API_TOKEN" ]; then
4343
echo "::warning::MaaS vLLM credentials not configured, skipping tests"
@@ -87,14 +87,14 @@ jobs:
8787
image_name: ${{ env.IMAGE_NAME }}
8888
image_tag: ${{ env.IMAGE_TAG }}
8989
extra_env: |
90-
VLLM_URL=${{ secrets.MAAS_VLLM_URL }}
91-
VLLM_API_TOKEN=${{ secrets.MAAS_VLLM_API_TOKEN }}
92-
VLLM_EMBEDDING_URL=${{ secrets.MAAS_EMBEDDING_URL }}
93-
VLLM_EMBEDDING_API_TOKEN=${{ secrets.MAAS_EMBEDDING_API_TOKEN }}
90+
VLLM_URL=${{ vars.LITEMAAS_URL }}
91+
VLLM_API_TOKEN=${{ secrets.LITEMAAS_API_KEY }}
92+
VLLM_EMBEDDING_URL=${{ vars.LITEMAAS_URL }}
93+
VLLM_EMBEDDING_API_TOKEN=${{ secrets.LITEMAAS_API_KEY }}
9494
TAVILY_SEARCH_API_KEY=${{ secrets.TAVILY_SEARCH_API_KEY }}
95-
EMBEDDING_MODEL=vllm-embedding/Nomic-embed-text-v2-moe
95+
EMBEDDING_MODEL=${{ env.EMBEDDING_MODEL }}
9696
EMBEDDING_PROVIDER=vllm-embedding
97-
EMBEDDING_PROVIDER_MODEL_ID=Nomic-embed-text-v2-moe
97+
EMBEDDING_PROVIDER_MODEL_ID=${{ vars.LITEMAAS_EMBEDDING_MODEL }}
9898
9999
- name: Clone upstream tests
100100
shell: bash
@@ -149,8 +149,8 @@ jobs:
149149
- name: Scrub secrets from test results
150150
if: ${{ !cancelled() }}
151151
env:
152-
VLLM_API_TOKEN: ${{ secrets.MAAS_VLLM_API_TOKEN }}
153-
VLLM_EMBEDDING_API_TOKEN: ${{ secrets.MAAS_EMBEDDING_API_TOKEN }}
152+
VLLM_API_TOKEN: ${{ secrets.LITEMAAS_API_KEY }}
153+
VLLM_EMBEDDING_API_TOKEN: ${{ secrets.LITEMAAS_API_KEY }}
154154
TAVILY_SEARCH_API_KEY: ${{ secrets.TAVILY_SEARCH_API_KEY }}
155155
run: |
156156
./tests/scrub_secrets.sh '/tmp/test-results/*' \

‎.github/workflows/test-pr-in-showroom.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,19 +159,22 @@ jobs:
159159
160160
- name: Setup CI environment
161161
id: setup
162-
uses: derekhiggins/llama-stack-showroom@f32973c9b7389b14d1988b55abfe74dd98c2432f # main as of 2026-06-05
162+
uses: opendatahub-io/ogx-showroom@5cc2fe338d2bbfe12159891bb3f0ab41469e389a # main as of 2026-07-24 (includes #56 model env vars)
163163
with:
164164
catalog_image: ${{ inputs.catalog_image }}
165-
llama_stack_image: "image-registry.openshift-image-registry.svc:5000/redhat-ods-operator/ogx-test:${{ needs.verify-and-build.outputs.tag }}"
165+
ogx_image: "image-registry.openshift-image-registry.svc:5000/redhat-ods-operator/ogx-test:${{ needs.verify-and-build.outputs.tag }}"
166166
operator_image: ${{ inputs.operator_image }}
167167
oc_server: ${{ secrets.OC_SERVER }}
168168
oc_token: ${{ secrets.OC_TOKEN }}
169169
env: |
170170
SHOWROOM_PULL_SECRET=${{ secrets.SHOWROOM_PULL_SECRET }}
171-
SHOWROOM_VLLM_URL=https://llama-3-2-3b-maas-apicast-production.apps.prod.rhoai.rh-aiservices-bu.com:443/v1
172-
SHOWROOM_VLLM_API_TOKEN=${{ secrets.SHOWROOM_VLLM_API_TOKEN }}
173-
SHOWROOM_VLLM_EMBEDDING_URL=https://nomic-embed-text-v1-5-maas-apicast-production.apps.prod.rhoai.rh-aiservices-bu.com:443/v1
174-
SHOWROOM_VLLM_EMBEDDING_API_TOKEN=${{ secrets.SHOWROOM_VLLM_EMBEDDING_API_TOKEN }}
171+
SHOWROOM_VLLM_URL=${{ vars.LITEMAAS_URL }}
172+
SHOWROOM_VLLM_API_TOKEN=${{ secrets.LITEMAAS_API_KEY }}
173+
SHOWROOM_INFERENCE_MODEL=${{ vars.LITEMAAS_INFERENCE_MODEL }}
174+
SHOWROOM_VLLM_EMBEDDING_URL=${{ vars.LITEMAAS_URL }}
175+
SHOWROOM_VLLM_EMBEDDING_API_TOKEN=${{ secrets.LITEMAAS_API_KEY }}
176+
SHOWROOM_EMBEDDING_MODEL=${{ vars.LITEMAAS_EMBEDDING_MODEL }}
177+
SHOWROOM_EMBEDDING_PROVIDER_MODEL_ID=${{ vars.LITEMAAS_EMBEDDING_MODEL }}
175178
SHOWROOM_OPENAI_API_KEY=${{ secrets.SHOWROOM_OPENAI_API_KEY }}
176179
177180
- name: Push image to OpenShift registry

‎.github/workflows/test-upstream-in-showroom.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Setup CI environment
5454
id: setup
55-
uses: opendatahub-io/ogx-showroom@a3a6adc939c464c9acc7f224482f5dacbf83558d # main as of 2026-06-09
55+
uses: opendatahub-io/ogx-showroom@5cc2fe338d2bbfe12159891bb3f0ab41469e389a # main as of 2026-07-24 (includes #56 model env vars)
5656
with:
5757
catalog_image: ${{ inputs.catalog_image }}
5858
ogx_image: "image-registry.openshift-image-registry.svc:5000/redhat-ods-operator/ogx-test:${{ steps.build.outputs.tag }}"
@@ -61,10 +61,13 @@ jobs:
6161
oc_token: ${{ secrets.OC_TOKEN }}
6262
env: |
6363
SHOWROOM_PULL_SECRET=${{ secrets.SHOWROOM_PULL_SECRET }}
64-
SHOWROOM_VLLM_URL=https://llama-3-2-3b-maas-apicast-production.apps.prod.rhoai.rh-aiservices-bu.com:443/v1
65-
SHOWROOM_VLLM_API_TOKEN=${{ secrets.SHOWROOM_VLLM_API_TOKEN }}
66-
SHOWROOM_VLLM_EMBEDDING_URL=https://nomic-embed-text-v1-5-maas-apicast-production.apps.prod.rhoai.rh-aiservices-bu.com:443/v1
67-
SHOWROOM_VLLM_EMBEDDING_API_TOKEN=${{ secrets.SHOWROOM_VLLM_EMBEDDING_API_TOKEN }}
64+
SHOWROOM_VLLM_URL=${{ vars.LITEMAAS_URL }}
65+
SHOWROOM_VLLM_API_TOKEN=${{ secrets.LITEMAAS_API_KEY }}
66+
SHOWROOM_INFERENCE_MODEL=${{ vars.LITEMAAS_INFERENCE_MODEL }}
67+
SHOWROOM_VLLM_EMBEDDING_URL=${{ vars.LITEMAAS_URL }}
68+
SHOWROOM_VLLM_EMBEDDING_API_TOKEN=${{ secrets.LITEMAAS_API_KEY }}
69+
SHOWROOM_EMBEDDING_MODEL=${{ vars.LITEMAAS_EMBEDDING_MODEL }}
70+
SHOWROOM_EMBEDDING_PROVIDER_MODEL_ID=${{ vars.LITEMAAS_EMBEDDING_MODEL }}
6871
SHOWROOM_OPENAI_API_KEY=${{ secrets.SHOWROOM_OPENAI_API_KEY }}
6972
7073
- name: Push image to OpenShift registry

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ An orchestrator workflow (`responses-weekly.yml` / "Responses: Test Report") run
8383
|----------|--------------------|-----------------|----------|
8484
| OpenAI | gpt-4.1-nano | text-embedding-3-small | `responses-openai.yml` |
8585
| Vertex AI | gemini-2.5-flash | gemini-embedding-2 | `responses-vertexai.yml` |
86-
| vLLM MaaS | llama-3-2-3b | nomic-embed-text-v1-5 | `responses-vllm-maas.yml` |
86+
| vLLM MaaS | Qwen3.6-35B-A3B | Nomic-embed-text-v2-moe | `responses-vllm-maas.yml` |
8787

8888
### How it works
8989

@@ -121,7 +121,7 @@ To override models: pass comma-separated model IDs via the `models` input when d
121121
|----------|---------|
122122
| OpenAI | `OPENAI_API_KEY` |
123123
| Vertex AI | `VERTEX_AI_PROJECT`, `VERTEX_AI_LOCATION` (default: `global`), `GCP_WORKLOAD_IDENTITY_PROVIDER` |
124-
| vLLM MaaS | `MAAS_VLLM_URL`, `MAAS_VLLM_API_TOKEN`, `MAAS_EMBEDDING_URL`, `MAAS_EMBEDDING_API_TOKEN` |
124+
| vLLM MaaS | `LITEMAAS_API_KEY` (secret), `LITEMAAS_URL` (var), `LITEMAAS_INFERENCE_MODEL` (var), `LITEMAAS_EMBEDDING_MODEL` (var) |
125125

126126
## ARM64 Support
127127

0 commit comments

Comments
 (0)