Skip to content

Commit 0ecdf0a

Browse files
author
Radovan Fuchs
committed
fix
1 parent 0be3deb commit 0ecdf0a

2 files changed

Lines changed: 22 additions & 6 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,13 @@ spec:
289289
script: |
290290
set -e
291291
echo "[e2e] 1/8 Starting run-e2e-tests step"
292-
echo "[e2e] 2/8 Installing deps (git, tar, jq, curl-minimal)..."
293-
microdnf -y install git tar jq curl-minimal
292+
echo "[e2e] 2/8 Installing deps (git, tar, jq, curl-minimal, python3)..."
293+
microdnf -y install git tar jq curl-minimal python3
294294
echo "[e2e] 3/8 Downloading oc client..."
295295
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
296296
tar -xzf oc.tar.gz && chmod +x kubectl oc && mv oc kubectl /usr/local/bin/
297-
echo "[e2e] 4/8 Parsing SNAPSHOT (length ${#SNAPSHOT} chars)..."
297+
echo "[e2e] 4/8 SNAPSHOT (length ${#SNAPSHOT} chars; clone URL fixed — SNAPSHOT is main/upstream, not fork)..."
298+
# Fixed fork + branch: Konflux SNAPSHOT points at main repo/rev, not the PR/fork under test.
298299
REPO_URL="https://github.com/radofuchs/lightspeed-stack.git"
299300
REPO_REV="lcore-1221-konflux-e2e-tests"
300301
echo "[e2e] 5/8 Clone $REPO_URL @ $REPO_REV"

tests/e2e-prow/rhoai/pipeline.sh

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,24 @@ export LIGHTSPEED_STACK_IMAGE
2424
# 2. ENVIRONMENT SETUP
2525
#========================================
2626
log "===== Setting up environment variables ====="
27-
# export OPENAI_API_KEY="${OPENAI_API_KEY:-$(cat /var/run/openai/openai-api-key 2>/dev/null || true)}"
28-
# export QUAY_ROBOT_NAME=$(cat /var/run/quay-aipcc-name/lcore-quay-name-lcore-test || true)
29-
# export QUAY_ROBOT_PASSWORD=$(cat /var/run/quay-aipcc-password/lcore-quay-password-lcore-test || true)
27+
# Konflux/Tekton: credentials from mounted volumes (paths match .tekton integration pipeline)
28+
if [[ -z "${OPENAI_API_KEY:-}" ]] && [[ -r /var/run/openai/openai-api-key ]]; then
29+
export OPENAI_API_KEY="$(cat /var/run/openai/openai-api-key)"
30+
fi
31+
if [[ -z "${QUAY_ROBOT_NAME:-}" && -d /var/run/quay-aipcc-name ]]; then
32+
shopt -s nullglob
33+
for _f in /var/run/quay-aipcc-name/*; do
34+
[[ -f "$_f" ]] && export QUAY_ROBOT_NAME="$(cat "$_f")" && break
35+
done
36+
shopt -u nullglob
37+
fi
38+
if [[ -z "${QUAY_ROBOT_PASSWORD:-}" && -d /var/run/quay-aipcc-password ]]; then
39+
shopt -s nullglob
40+
for _f in /var/run/quay-aipcc-password/*; do
41+
[[ -f "$_f" ]] && export QUAY_ROBOT_PASSWORD="$(cat "$_f")" && break
42+
done
43+
shopt -u nullglob
44+
fi
3045

3146
[[ -n "$QUAY_ROBOT_NAME" ]] && log "✅ QUAY_ROBOT_NAME is set" || { echo "❌ Missing QUAY_ROBOT_NAME"; exit 1; }
3247
[[ -n "$QUAY_ROBOT_PASSWORD" ]] && log "✅ QUAY_ROBOT_PASSWORD is set" || { echo "❌ Missing QUAY_ROBOT_PASSWORD"; exit 1; }

0 commit comments

Comments
 (0)