Skip to content

Commit 0b689d5

Browse files
authored
Update ci.yaml
1 parent e68bde7 commit 0b689d5

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -265,16 +265,20 @@ jobs:
265265
ALTER AUTHENTICATION v_dbadmin_hash PRIORITY 10000;
266266
GRANT AUTHENTICATION v_dbadmin_hash TO dbadmin;
267267
\"
268-
"
269-
270-
- name: Run Python tests in-cluster (robust + execution)
268+
" - name: Run Python tests in-cluster (robust + execution)
271269
run: |
272270
set -euo pipefail
273271
NS=my-verticadb-operator
274272
SVC=verticadb-sample-defaultsubcluster
275-
LOCATOR="${SVC}.${NS}.svc.cluster.local:5433"
273+
DB=vdb
274+
USER=oauth_user
275+
REALM=test
276+
CLIENT_ID=vertica
277+
CLIENT_SECRET=P9f8350QQIUhFfK1GF5sMhq4Dm3P6Sbs
278+
PASSWORD=password
279+
IMAGE="python:${{ matrix.python-version }}-slim"
276280
POD=py-test-runner
277-
IMAGE=python:${{ matrix.python-version }}-slim
281+
LOCATOR="${SVC}.${NS}.svc.cluster.local:5433"
278282
279283
echo "📦 Ensuring namespace ${NS} exists..."
280284
kubectl get ns ${NS} >/dev/null 2>&1 || kubectl create ns ${NS}
@@ -304,7 +308,7 @@ jobs:
304308
tar cf - . | kubectl -n ${NS} exec -i pod/${POD} -- tar xf - -C /workspace
305309
306310
echo "🧰 Installing dependencies..."
307-
kubectl -n ${NS} exec pod/${POD} -- bash -lc 'apt-get update -qq && apt-get install -y -qq build-essential libssl-dev libpq-dev netcat-traditional curl || true'
311+
kubectl -n ${NS} exec pod/${POD} -- bash -lc 'apt-get update -qq && apt-get install -y -qq build-essential libssl-dev libpq-dev netcat-traditional curl >/dev/null 2>&1 || true'
308312
kubectl -n ${NS} exec pod/${POD} -- bash -lc 'python -m pip install --upgrade pip >/dev/null 2>&1 || true; pip install tox pytest >/dev/null 2>&1 || true'
309313
310314
echo "🔑 Fetching token from Keycloak..."
@@ -329,7 +333,7 @@ jobs:
329333
}
330334
kubectl -n keycloak delete pod ${CT_POD} --ignore-not-found || true
331335
332-
TOKEN=$(python3 -c 'import json; print(__import__("json").load(open("token.json")).get("access_token",""))')
336+
TOKEN=$(python3 -c 'import json,sys;print(json.load(open("token.json")).get("access_token",""))')
333337
if [ -z "$TOKEN" ]; then
334338
echo "❌ No access_token found in token.json"
335339
cat token.json
@@ -347,8 +351,9 @@ jobs:
347351
export VP_TEST_OAUTH_ACCESS_TOKEN='${TOKEN}'
348352
export VP_TEST_HOST='${SVC}.${NS}.svc.cluster.local'
349353
export VP_TEST_PORT=5433
350-
export VP_TEST_DATABASE='vdb'
351-
export VP_TEST_USER='oauth_user'
354+
export VP_TEST_DATABASE='${DB}'
355+
export VP_TEST_USER='${USER}'
356+
export VP_TEST_OAUTH_USER='${USER}'
352357
353358
echo '🔍 Checking connectivity to Vertica...'
354359
if command -v nc >/dev/null 2>&1; then
@@ -358,9 +363,9 @@ jobs:
358363
fi
359364
360365
echo '✅ Vertica reachable; performing token introspection...'
361-
INTROSPECT_OUTPUT=\$(curl -s -X POST http://keycloak.keycloak.svc.cluster.local:8080/realms/test/protocol/openid-connect/token/introspect \
362-
-d 'client_id=vertica' \
363-
-d 'client_secret=P9f8350QQIUhFfK1GF5sMhq4Dm3P6Sbs' \
366+
INTROSPECT_OUTPUT=\$(curl -s -X POST http://keycloak.keycloak.svc.cluster.local:8080/realms/${REALM}/protocol/openid-connect/token/introspect \
367+
-d 'client_id=${CLIENT_ID}' \
368+
-d 'client_secret=${CLIENT_SECRET}' \
364369
-d 'token='\${VP_TEST_OAUTH_ACCESS_TOKEN})
365370
366371
if echo \"\$INTROSPECT_OUTPUT\" | grep -q '\"active\":true'; then
@@ -372,13 +377,6 @@ jobs:
372377
fi
373378
374379
echo '🚦 Running pytest suite via tox...'
375-
echo "Vertica reachable; running tests..."
376-
VP_TEST_HOST="${HOST}" \
377-
VP_TEST_PORT=5433 \
378-
VP_TEST_DATABASE="${DB}" \
379-
VP_TEST_USER="${USER}" \
380-
VP_TEST_OAUTH_USER="${USER}" \
381-
VP_TEST_OAUTH_ACCESS_TOKEN="${TOKEN}" \
382380
tox -e py
383381
"
384382

0 commit comments

Comments
 (0)