Skip to content

Commit 29740d1

Browse files
fix keycload env variables
Issue: ZENKO-5203
1 parent 9b9d44d commit 29740d1

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.github/scripts/end2end/run-e2e-ctst.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ kubectl create clusterrolebinding serviceaccounts-cluster-admin \
168168
# --arg keycloak_password "${OIDC_PASSWORD:-123}" \
169169
# --arg keycloak_client_id "${OIDC_CLIENT_ID:-zenko-ui}" \
170170

171+
172+
# docker run \
173+
# --rm \
174+
# --network=host \
175+
# "${E2E_IMAGE}" /bin/bash \
176+
# -c "SUBDOMAIN=${SUBDOMAIN} CONTROL_PLANE_INGRESS_ENDPOINT=${OIDC_ENDPOINT} ACCOUNT=${ZENKO_ACCOUNT_NAME} KEYCLOAK_REALM=${KEYCLOAK_TEST_REALM_NAME} STORAGE_MANAGER=${STORAGE_MANAGER_USER_NAME} STORAGE_ACCOUNT_OWNER=${STORAGE_ACCOUNT_OWNER_USER_NAME} DATA_CONSUMER=${DATA_CONSUMER_USER_NAME} DATA_ACCESSOR=${DATA_ACCESSOR_USER_NAME} /ctst/node_modules/cli-testing/bin/seedKeycloak.sh"; [[ $? -eq 1 ]] && exit 1 || echo 'Keycloak Configured!'
177+
171178
# Running end2end ctst tests
172179
# Using overrides as we need to attach a local folder to the pod
173180
kubectl run $POD_NAME \
@@ -178,6 +185,11 @@ kubectl run $POD_NAME \
178185
--attach=True \
179186
--image-pull-policy=IfNotPresent \
180187
--env=TARGET_VERSION=$VERSION \
188+
--env=ACCOUNT=${ZENKO_ACCOUNT_NAME} \
189+
--env=STORAGE_MANAGER=${STORAGE_MANAGER_USER_NAME} \
190+
--env=STORAGE_ACCOUNT_OWNER=${STORAGE_ACCOUNT_OWNER_USER_NAME} \
191+
--env=DATA_CONSUMER=${DATA_CONSUMER_USER_NAME} \
192+
--env=DATA_ACCESSOR=${DATA_ACCESSOR_USER_NAME} \
181193
--env=SEED_KEYCLOAK_DEFAULT_ROLES=true \
182194
--env=KEYCLOAK_HOST=${KEYCLOAK_TEST_HOST} \
183195
--env=KEYCLOAK_REALM=${KEYCLOAK_TEST_REALM_NAME} \

tests/ctst/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@types/qs": "^6.9.15",
1616
"assert": "^2.1.0",
1717
"aws4-axios": "^3.3.8",
18-
"cli-testing": "git+https://github.com/scality/cli-testing.git#e7dddfdbdb7ff9ab22695e542a2051b0c6cbab4f",
18+
"cli-testing": "git+https://github.com/scality/cli-testing.git#1dac0cf16307c1d5ca11105f332d5ed8284abade",
1919
"prometheus-query": "^3.4.0",
2020
"proper-lockfile": "^4.1.2",
2121
"qs": "^6.13.0",

tests/ctst/yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4373,9 +4373,9 @@ cli-table3@0.6.5, cli-table3@^0.6.0:
43734373
optionalDependencies:
43744374
"@colors/colors" "1.5.0"
43754375

4376-
"cli-testing@git+https://github.com/scality/cli-testing.git#e7dddfdbdb7ff9ab22695e542a2051b0c6cbab4f":
4376+
"cli-testing@git+https://github.com/scality/cli-testing.git#1dac0cf16307c1d5ca11105f332d5ed8284abade":
43774377
version "1.3.0"
4378-
resolved "git+https://github.com/scality/cli-testing.git#e7dddfdbdb7ff9ab22695e542a2051b0c6cbab4f"
4378+
resolved "git+https://github.com/scality/cli-testing.git#1dac0cf16307c1d5ca11105f332d5ed8284abade"
43794379
dependencies:
43804380
"@aws-crypto/sha256-universal" "^5.2.0"
43814381
"@aws-sdk/client-iam" "^3.879.0"

0 commit comments

Comments
 (0)