WIP

Author: mads-hartmann

.werft/jobs/build/trigger-integration-tests.ts

@@ -23,21 +23,7 @@ export async function triggerIntegrationTests(werft: Werft, config: JobConfig, u
     }
 
     try {
-        const imageVersion = exec(
-            `docker run --rm eu.gcr.io/gitpod-core-dev/build/versions:${config.version} cat /versions.yaml | yq r - 'components.integrationTest.version'`,
-            { silent: true },
-        ).stdout.trim();
-
-        const containerID = exec(`docker create -e GOOGLE_APPLICATION_CREDENTIALS= eu.gcr.io/gitpod-core-dev/build/integration-tests:${imageVersion} -kubeconfig=/kubeconfig -namespace=default`, {slice: phases.TRIGGER_INTEGRATION_TESTS}).trim()
-        werft.log(phases.TRIGGER_INTEGRATION_TESTS, `Created container with ID ${containerID}`)
-
-        werft.log(phases.TRIGGER_INTEGRATION_TESTS, `Will copy over files`)
-        exec(`docker cp ${PREVIEW_K3S_KUBECONFIG_PATH} ${containerID}:/kubeconfig`, {slice: phases.TRIGGER_INTEGRATION_TESTS})
-        exec(`docker cp /home/gitpod/.config/gcloud/legacy_credentials/[email protected]/adc.json ${containerID}:/adc.json`, {slice: phases.TRIGGER_INTEGRATION_TESTS})
-
-        werft.log(phases.TRIGGER_INTEGRATION_TESTS, `Will start container`)
-        exec(`docker start --interactive --attach ${containerID}`, {slice: phases.TRIGGER_INTEGRATION_TESTS})
-
+        exec(`KUBECONFIG="${PREVIEW_K3S_KUBECONFIG_PATH}" GOOGLE_APPLICATION_CREDENTIALS=/home/gitpod/.config/gcloud/legacy_credentials/[email protected]/adc.json /workspace/tests/run.sh`, {slice: phases.TRIGGER_INTEGRATION_TESTS})
         werft.done(phases.TRIGGER_INTEGRATION_TESTS);
     } catch (err) {
         if (!config.mainBuild) {

test/README.md

@@ -21,33 +21,22 @@ Such tests are for example:
 
 ### Automatically at Gitpod
 
-There is a [werft job](../.werft/run-integration-tests.yaml) that runs the integration tests against `core-dev` preview environments.
+You can opt-in to run the integrations tests as part of the build job. that runs the integration tests against preview environments.
 
  > For tests that require an existing user the framework tries to automatically select one from the DB.
  > - On preview envs make sure to create one before running tests against it!
  > - If it's important to use a certain user (with fixed settings, for example) pass the additional `username` parameter.
 
 Example command:
-```
-werft run github -j .werft/run-integration-tests.yaml -a namespace=staging-gpl-2658-int-tests -a version=gpl-2658-int-tests.57 -f
+
+```sh
+werft run github -a with-preview=true -a with-integration-tests=true -f
 ```
 
 ### Manually
 
 You may want to run tests to assert whether a Gitpod installation is successfully integrated.
 
-#### Using a pod
-
-Best for when you want to validate an environment.
-
-1. Update image name in `integration.yaml` for job `integration-job` to latest built by werft.
-2. Optionally add your username in that job argument or any other additional params.
-2. Apply yaml file that will add all necessary permissions and create a job that will run tests.
-   * [`kubectl apply -f ./integration.yaml`](./integration.yaml)
-3. Check logs to inspect test results like so `kubectl logs -f jobs/integration-job`.
-4. Tear down the integration user and job when testing is done.
-   * [`kubectl delete -f ./integration.yaml`](./integration.yaml)
-
 #### Go test
 
 This is best for when you're actively developing Gitpod.