Skip to content

Commit a82a23f

Browse files
kylos101roboquat
authored andcommitted
[tests] run in core-dev again
1 parent 50c2cf5 commit a82a23f

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.werft/run-integration-tests.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,23 @@ pod:
6161
set -Eeuo pipefail
6262
6363
echo "[prep] receiving config..."
64-
mkdir /root/.config
65-
cp -R /config/gcloud /root/.config/gcloud
66-
export GOOGLE_APPLICATION_CREDENTIALS=/config/gcloud/legacy_credentials/gitpod-deployer@gitpod-core-dev.iam.gserviceaccount.com/adc.json
64+
export GOOGLE_APPLICATION_CREDENTIALS="/config/gcloud/legacy_credentials/cd-gitpod-deployer@gitpod-core-dev.iam.gserviceaccount.com/adc.json"
6765
echo "[prep] received config."
6866
6967
USERNAME="{{ .Annotations.username }}"
7068
if [[ "$USERNAME" == "<no value>" ]]; then
7169
USERNAME=""
7270
fi
7371
echo "[prep] using username: $USERNAME"
72+
73+
args=()
74+
args+=( '-kubeconfig=/config/kubeconfig' )
75+
args+=( "-namespace={{ .Annotations.namespace }}" )
76+
[[ "$USERNAME" != "" ]] && args+=( "-username=$USERNAME" )
77+
echo "[prep] args: ${args[@]}"
7478
echo "[prep|DONE]"
7579
76-
/entrypoint.sh -kubeconfig=/config/kubeconfig -namespace={{ .Annotations.namespace }} -username=$USERNAME 2>&1 | ts "[int-tests] "
80+
/entrypoint.sh "${args[@]}" 2>&1 | ts "[int-tests] "
7781
7882
RC=${PIPESTATUS[0]}
7983
if [ $RC -eq 1 ]; then

test/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ There is a [werft job](../.werft/run-integration-tests.yaml) that runs the integ
2929
3030
Example command:
3131
```
32-
werft job run github -j .werft/run-integration-tests.yaml -a namespace=staging-gpl-2658-int-tests -a version=gpl-2658-int-tests.57 -f
32+
werft run github -j .werft/run-integration-tests.yaml -a namespace=staging-gpl-2658-int-tests -a version=gpl-2658-int-tests.57 -f
3333
```
3434

3535
### Manually
@@ -51,7 +51,7 @@ Best for when you want to validate an environment.
5151
#### Go test
5252

5353
Best for when you're actively developing Gitpod.
54-
Test will work if images that they use are already cached by gitpod instnance. If not, they might fail if it takes too long to pull an image.
54+
Test will work if images that they use are already cached by Gitpod instance. If not, they might fail if it takes too long to pull an image.
5555
There are 4 different types of tests:
5656
1. Enterprise specific, that require valid license to be installed. Run those with `-enterprise=true`
5757
2. Tests that require correct user (user should have github OAuth integration setup with gitpod). Run those with `-username=<gitpod_username>`. Make sure to load https://github.com/gitpod-io/gitpod-test-repo and https://github.com/gitpod-io/gitpod workspaces inside your gitpod that you are testing to preload those images onto your node. Wait for it to finish pulling those image, this will ensure that test will not fail due to timeout while waiting to pull an image for the first time.

0 commit comments

Comments
 (0)