test test test

Author: nandajavarma

.werft/k3s-installer-tests.yaml

@@ -51,6 +51,9 @@ pod:
   - name: sh-playground-dns-perm
     secret:
       secretName: sh-playground-dns-perm
+  - name: self-hosted-github-oauth
+    secret:
+      secretName: self-hosted-github-oauth
   containers:
   - name: nightly-test
     image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-upgrade.0
@@ -61,13 +64,17 @@ pod:
       mountPath: /mnt/secrets/sh-playground-sa-perm
     - name: sh-playground-dns-perm # this sa is used for the DNS management
       mountPath: /mnt/secrets/sh-playground-dns-perm
+    - name: self-hosted-github-oauth
+      mountPath: "/mnt/secrets/github-oauth"
     env:
       - name: GOOGLE_APPLICATION_CREDENTIALS
         value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
       - name: TF_VAR_sa_creds
         value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
       - name: TF_VAR_dns_sa_creds
         value: "/mnt/secrets/sh-playground-dns-perm/sh-dns-sa.json"
+      - name: GITHUB_SCM_OAUTH
+        value: "/mnt/secrets/github-oauth/provider"
       - name: NODENAME
         valueFrom:
           fieldRef:
@@ -117,7 +124,7 @@ pod:
         export domain="{{ .Annotations.subdomain }}"
 
         if [[ "$domain" == "<no value>" ]]; then
-          export TF_VAR_TEST_ID="$(echo $RANDOM | md5sum | head -c 5; echo)-k3s"
+          export TF_VAR_TEST_ID="p$(echo $RANDOM | md5sum | head -c 5; echo)-k3s"
         else
           export TF_VAR_TEST_ID="$domain"
         fi

install/tests/Makefile

@@ -162,8 +162,8 @@ get-kubeconfig: ${cloud}-kubeconfig
 get-github-config:
 ifneq ($(GITHUB_SCM_OAUTH),)
 	export SCM_OAUTH=./manifests/github-oauth.yaml && \
-	cat $$GITHUB_SCM_OAUTH/provider > $$SCM_OAUTH && \
-	yq w -i $$SCM_OAUTH 'oauth.callBackUrl' http://${TF_VAR_TEST_ID}.${DOMAIN}/auth/github.com/callback && \
+	cat $$GITHUB_SCM_OAUTH > $$SCM_OAUTH && \
+	yq w -i $$SCM_OAUTH 'oauth.callBackUrl' http://sh-preview.gitpod-dev.com/auth/github.com/callback/${TF_VAR_TEST_ID} && \
 	kubectl --kubeconfig=${KUBECONFIG} create namespace gitpod || echo "Gitpod namespace already exist" && \
 	kubectl --kubeconfig=${KUBECONFIG} delete secret github-oauth -n gitpod || echo "gitpod-oauth secret needs to be created" && \
 	kubectl --kubeconfig=${KUBECONFIG} create secret generic "github-oauth" --namespace gitpod --from-literal=provider="$$(cat $$SCM_OAUTH)" && \