Skip to content

Commit e8e226c

Browse files
authored
Merge pull request #2113 from syedriko/syedriko-lcore-3013
LCORE-3013: Integration tests are not started in Konflux for new PRs
2 parents 2c3e52e + d186f9c commit e8e226c

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

.tekton/integration-tests/pipeline/lightspeed-stack-integration-test.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: tekton.dev/v1beta1
33
kind: Pipeline
44
metadata:
5-
name: lightspeed-stack-integration-tests-pipeline
5+
name: lightspeed-stack-0-7-integration-tests-pipeline
66
spec:
77
description: |
88
This pipeline automates the process of running end-to-end tests for Lightspeed Stack
@@ -12,15 +12,15 @@ spec:
1212
params:
1313
- name: SNAPSHOT
1414
description: 'The JSON string representing the snapshot of the application under test (includes lightspeed-stack image).'
15-
default: '{"components": [{"name":"lightspeed-stack", "containerImage": "quay.io/example/lightspeed-stack:latest"}]}'
15+
default: '{"components": [{"name":"lightspeed-stack-0-7", "containerImage": "quay.io/example/lightspeed-stack-0-7:latest"}]}'
1616
type: string
1717
- name: llama-stack-image
1818
description: 'Llama Stack runs from source on UBI (init container clones repo and installs deps). Kept for logging/backwards compatibility.'
1919
default: 'run-from-source (UBI)'
2020
type: string
2121
- name: test-name
2222
description: 'The name of the test corresponding to a defined Konflux integration test.'
23-
default: 'lightspeed-stack-e2e-tests'
23+
default: 'lightspeed-stack-0-7-e2e-tests'
2424
- name: namespace
2525
description: 'Namespace to run tests in'
2626
default: 'lightspeed-stack'
@@ -117,8 +117,8 @@ spec:
117117
description: "commit sha to be used to store artifacts"
118118
script: |
119119
dnf -y install jq
120-
echo -n "$(jq -r --arg n "lightspeed-stack" '.components[] | select(.name == $n) | .containerImage // ""' <<< "$SNAPSHOT")" > $(step.results.lightspeed-stack-image.path)
121-
echo -n "$(jq -r --arg n "lightspeed-stack" '.components[] | select(.name == $n) | .source.git.revision // "latest"' <<< "$SNAPSHOT")" > $(step.results.commit.path)
120+
echo -n "$(jq -r --arg n "lightspeed-stack-0-7" '.components[] | select(.name == $n) | .containerImage // ""' <<< "$SNAPSHOT")" > $(step.results.lightspeed-stack-image.path)
121+
echo -n "$(jq -r --arg n "lightspeed-stack-0-7" '.components[] | select(.name == $n) | .source.git.revision // "latest"' <<< "$SNAPSHOT")" > $(step.results.commit.path)
122122
- name: echo-integration-params
123123
description: Echo all params passed to lightspeed-stack-integration-tests for verification before the test runs.
124124
runAfter:
@@ -278,8 +278,8 @@ spec:
278278
tar -xzf oc.tar.gz && chmod +x kubectl oc && mv oc kubectl /usr/local/bin/
279279
echo "[e2e] 4/8 SNAPSHOT (length ${#SNAPSHOT} chars; clone URL fixed — SNAPSHOT is main/upstream, not fork)..."
280280
# Fixed fork + branch: Konflux SNAPSHOT points at main repo/rev, not the PR/fork under test.
281-
REPO_URL=$(jq -r '.components[] | select(.name == "lightspeed-stack") | .source.git.url // "https://github.com/lightspeed-core/lightspeed-stack.git"' <<< "$SNAPSHOT")
282-
REPO_REV=$(jq -r '.components[] | select(.name == "lightspeed-stack") | .source.git.revision // "main"' <<< "$SNAPSHOT")
281+
REPO_URL=$(jq -r '.components[] | select(.name == "lightspeed-stack-0-7") | .source.git.url // "https://github.com/lightspeed-core/lightspeed-stack.git"' <<< "$SNAPSHOT")
282+
REPO_REV=$(jq -r '.components[] | select(.name == "lightspeed-stack-0-7") | .source.git.revision // "main"' <<< "$SNAPSHOT")
283283
echo "[e2e] 5/8 Clone $REPO_URL @ $REPO_REV"
284284
git clone -q "$REPO_URL" /workspace/lightspeed-stack
285285
cd /workspace/lightspeed-stack && git fetch origin "$REPO_REV" && git checkout -q "$REPO_REV"

.tekton/integration-tests/pipeline/lightspeed-stack-rhelai-test.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: tekton.dev/v1beta1
33
kind: Pipeline
44
metadata:
5-
name: lightspeed-stack-rhelai-tests-pipeline
5+
name: lightspeed-stack-0-7-rhelai-tests-pipeline
66
spec:
77
description: |
88
This pipeline provisions a RHEL AI instance on AWS (vLLM), an ephemeral
@@ -11,11 +11,11 @@ spec:
1111
params:
1212
- name: SNAPSHOT
1313
description: 'The JSON string representing the snapshot of the application under test.'
14-
default: '{"components": [{"name":"lightspeed-stack", "containerImage": "quay.io/example/lightspeed-stack:latest"}]}'
14+
default: '{"components": [{"name":"lightspeed-stack-0-7", "containerImage": "quay.io/example/lightspeed-stack-0-7:latest"}]}'
1515
type: string
1616
- name: test-name
1717
description: 'The name of the test corresponding to a defined Konflux integration test.'
18-
default: 'lightspeed-stack-rhelai-tests'
18+
default: 'lightspeed-stack-0-7-rhelai-tests'
1919
- name: rhelai-version
2020
description: 'RHEL AI version to provision.'
2121
default: '3.4.0'
@@ -285,8 +285,8 @@ spec:
285285
type: string
286286
script: |
287287
dnf -y install jq
288-
echo -n "$(jq -r --arg n "lightspeed-stack" '.components[] | select(.name == $n) | .containerImage // ""' <<< "$SNAPSHOT")" > $(step.results.lightspeed-stack-image.path)
289-
echo -n "$(jq -r --arg n "lightspeed-stack" '.components[] | select(.name == $n) | .source.git.revision // "latest"' <<< "$SNAPSHOT")" > $(step.results.commit.path)
288+
echo -n "$(jq -r --arg n "lightspeed-stack-0-7" '.components[] | select(.name == $n) | .containerImage // ""' <<< "$SNAPSHOT")" > $(step.results.lightspeed-stack-image.path)
289+
echo -n "$(jq -r --arg n "lightspeed-stack-0-7" '.components[] | select(.name == $n) | .source.git.revision // "latest"' <<< "$SNAPSHOT")" > $(step.results.commit.path)
290290
291291
# ── Full E2E tests (runs after both RHEL AI and OpenShift are ready) ──
292292
- name: rhelai-e2e-tests
@@ -407,8 +407,8 @@ spec:
407407
curl -sL -o oc.tar.gz https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest-4.19/openshift-client-linux-amd64-rhel9.tar.gz
408408
tar -xzf oc.tar.gz && chmod +x kubectl oc && mv oc kubectl /usr/local/bin/
409409
echo "[e2e] 4/8 VLLM_URL=$VLLM_URL"
410-
REPO_URL=$(jq -r '.components[] | select(.name == "lightspeed-stack") | .source.git.url // "https://github.com/lightspeed-core/lightspeed-stack.git"' <<< "$SNAPSHOT")
411-
REPO_REV=$(jq -r '.components[] | select(.name == "lightspeed-stack") | .source.git.revision // "main"' <<< "$SNAPSHOT")
410+
REPO_URL=$(jq -r '.components[] | select(.name == "lightspeed-stack-0-7") | .source.git.url // "https://github.com/lightspeed-core/lightspeed-stack.git"' <<< "$SNAPSHOT")
411+
REPO_REV=$(jq -r '.components[] | select(.name == "lightspeed-stack-0-7") | .source.git.revision // "main"' <<< "$SNAPSHOT")
412412
echo "[e2e] 5/8 Clone $REPO_URL @ $REPO_REV"
413413
git clone -q "$REPO_URL" /workspace/lightspeed-stack
414414
cd /workspace/lightspeed-stack && git fetch origin "$REPO_REV" && git checkout -q "$REPO_REV"

0 commit comments

Comments
 (0)