Skip to content

Commit 21230d3

Browse files
committed
WIP
1 parent c376357 commit 21230d3

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.werft/jobs/build/job-config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export interface JobConfig {
2323
storage: string;
2424
version: string;
2525
withContrib: boolean;
26-
withIntegrationTests: boolean;
26+
withIntegrationTests?: string;
2727
withUpgradeTests: boolean;
2828
withSelfHostedPreview: boolean;
2929
withObservability: boolean;
@@ -78,7 +78,7 @@ export function jobConfig(werft: Werft, context: any): JobConfig {
7878
const withContrib = "with-contrib" in buildConfig || mainBuild;
7979
const withPreview = "with-preview" in buildConfig && !mainBuild;
8080
const storage = buildConfig["storage"] || "";
81-
const withIntegrationTests = "with-integration-tests" in buildConfig && !mainBuild;
81+
const withIntegrationTests = "with-integration-tests" in buildConfig ? buildConfig["with-integration-tests"] || "all" : null;
8282
const withUpgradeTests = "with-upgrade-tests" in buildConfig && !mainBuild;
8383
const fromVersion = withUpgradeTests ? buildConfig["from-version"] : "";
8484
const replicatedChannel = buildConfig["channel"];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export async function runIntegrationTests(werft: Werft, config: JobConfig, usern
2323
}
2424

2525
try {
26-
exec(`KUBECONFIG="${PREVIEW_K3S_KUBECONFIG_PATH}" GOOGLE_APPLICATION_CREDENTIALS=/home/gitpod/.config/gcloud/legacy_credentials/[email protected]/adc.json /workspace/test/run.sh`)
26+
exec(`KUBECONFIG="${PREVIEW_K3S_KUBECONFIG_PATH}" GOOGLE_APPLICATION_CREDENTIALS=/home/gitpod/.config/gcloud/legacy_credentials/[email protected]/adc.json /workspace/test/run.sh ${config.withIntegrationTests}`)
2727
werft.done(phases.RUN_INTEGRATION_TESTS);
2828
} catch (err) {
2929
if (!config.mainBuild) {

test/run.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ THIS_DIR="$(dirname "$0")"
66

77
FAILURE_COUNT=0
88

9+
#TODO: parse args here and add to TEST_LIST based on teams passed in
10+
#TODO: Also update docs with examples
11+
912
if [[ "${TEST_LIST-}" == "" ]]; then
1013
TEST_LIST="$THIS_DIR/tests/components/* $THIS_DIR/tests/ide/* $THIS_DIR/tests/workspace"
1114
fi

0 commit comments

Comments
 (0)