From d540ec08278b339f423e391ff99518713d384cd2 Mon Sep 17 00:00:00 2001 From: iQQBot Date: Mon, 14 Jul 2025 15:13:11 +0800 Subject: [PATCH 1/3] [dev] update dev image --- .github/actions/delete-preview/Dockerfile | 2 +- .github/actions/deploy-gitpod/Dockerfile | 2 +- .github/actions/deploy-monitoring-satellite/Dockerfile | 2 +- .github/actions/preview-create/Dockerfile | 2 +- .github/workflows/build.yml | 6 +++--- .github/workflows/code-nightly.yml | 2 +- .github/workflows/ide-integration-tests.yml | 4 ++-- .github/workflows/jetbrains-auto-update-template.yml | 2 +- .github/workflows/jetbrains-integration-test.yml | 2 +- .github/workflows/preview-env-check-regressions.yml | 2 +- .github/workflows/preview-env-gc.yml | 2 +- .github/workflows/workspace-integration-tests.yml | 4 ++-- .gitpod.yml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile index 4b4d08160d581c..84767865d05b23 100644 --- a/.github/actions/delete-preview/Dockerfile +++ b/.github/actions/delete-preview/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile index 4b4d08160d581c..84767865d05b23 100644 --- a/.github/actions/deploy-gitpod/Dockerfile +++ b/.github/actions/deploy-gitpod/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-monitoring-satellite/Dockerfile b/.github/actions/deploy-monitoring-satellite/Dockerfile index 4b4d08160d581c..84767865d05b23 100644 --- a/.github/actions/deploy-monitoring-satellite/Dockerfile +++ b/.github/actions/deploy-monitoring-satellite/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile index 4b4d08160d581c..84767865d05b23 100644 --- a/.github/actions/preview-create/Dockerfile +++ b/.github/actions/preview-create/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3d5c1f1ff74c7..29500a604931d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,7 @@ jobs: cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }} runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 steps: - uses: actions/checkout@v4 - name: Setup Environment @@ -188,7 +188,7 @@ jobs: ports: - 6379:6379 container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 env: DB_HOST: "mysql" DB_PORT: "23306" @@ -521,7 +521,7 @@ jobs: - create-runner runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 if: needs.configuration.outputs.with_integration_tests != '' && needs.configuration.outputs.is_scheduled_run != 'true' concurrency: group: ${{ needs.configuration.outputs.preview_name }}-integration-test diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml index c45c92ef8c36c0..6ecff4002b5514 100644 --- a/.github/workflows/code-nightly.yml +++ b/.github/workflows/code-nightly.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-environment diff --git a/.github/workflows/ide-integration-tests.yml b/.github/workflows/ide-integration-tests.yml index 4408be7a87b9e9..f334d2d0594652 100644 --- a/.github/workflows/ide-integration-tests.yml +++ b/.github/workflows/ide-integration-tests.yml @@ -43,7 +43,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -131,7 +131,7 @@ jobs: needs: [configuration, infrastructure, create-runner] runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/jetbrains-auto-update-template.yml b/.github/workflows/jetbrains-auto-update-template.yml index aad5c17e536bab..687743667dcc03 100644 --- a/.github/workflows/jetbrains-auto-update-template.yml +++ b/.github/workflows/jetbrains-auto-update-template.yml @@ -23,7 +23,7 @@ jobs: update-jetbrains: runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 needs: [ create-runner ] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/jetbrains-integration-test.yml b/.github/workflows/jetbrains-integration-test.yml index 876c33501afc37..da54ccab6ff970 100644 --- a/.github/workflows/jetbrains-integration-test.yml +++ b/.github/workflows/jetbrains-integration-test.yml @@ -39,7 +39,7 @@ jobs: gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }} jetbrains-smoke-test-linux: container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] steps: diff --git a/.github/workflows/preview-env-check-regressions.yml b/.github/workflows/preview-env-check-regressions.yml index b33e21e065c8fc..79b2380d451915 100644 --- a/.github/workflows/preview-env-check-regressions.yml +++ b/.github/workflows/preview-env-check-regressions.yml @@ -99,7 +99,7 @@ jobs: if: ${{ needs.configuration.outputs.skip == 'false' }} runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml index 62561f93b3dbb7..dc2754bf8cfbad 100644 --- a/.github/workflows/preview-env-gc.yml +++ b/.github/workflows/preview-env-gc.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 outputs: names: ${{ steps.set-matrix.outputs.names }} count: ${{ steps.set-matrix.outputs.count }} diff --git a/.github/workflows/workspace-integration-tests.yml b/.github/workflows/workspace-integration-tests.yml index 09b7c314b545d4..dcb9aa9663b79a 100644 --- a/.github/workflows/workspace-integration-tests.yml +++ b/.github/workflows/workspace-integration-tests.yml @@ -61,7 +61,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -166,7 +166,7 @@ jobs: needs: [configuration, infrastructure, create-runner] runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 steps: - uses: actions/checkout@v4 - name: Integration Test diff --git a/.gitpod.yml b/.gitpod.yml index 1e5a6c2ff29112..27d3c04d46a2e5 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33389 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: From 1f9e9e8f37a52d0b6c37d8e58ff9a8e507961585 Mon Sep 17 00:00:00 2001 From: Gero Posmyk-Leinemann Date: Wed, 23 Jul 2025 12:35:13 +0000 Subject: [PATCH 2/3] [server] Temporarily disable broken bitbucket tests --- .../bitbucket-server-api.spec.ts | 3 +-- .../bitbucket-server-context-parser.spec.ts | 3 +-- .../bitbucket-server-file-provider.spec.ts | 3 +-- ...itbucket-server-repository-provider.spec.ts | 3 +-- .../bitbucket-server-token-validator.spec.ts | 18 +++++++++--------- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts index 63071f2a7981e8..68563bbdff0a5b 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts @@ -5,7 +5,6 @@ */ import { User } from "@gitpod/gitpod-protocol"; -import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -19,7 +18,7 @@ import { TokenProvider } from "../user/token-provider"; import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; -@suite(timeout(10000), retries(0), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) +@suite(timeout(10000), retries(0), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) class TestBitbucketServerApi { protected api: BitbucketServerApi; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts index d2ff2a17fa45a0..a71bdaf5e07b9c 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts @@ -5,7 +5,6 @@ */ import { User } from "@gitpod/gitpod-protocol"; -import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -21,7 +20,7 @@ import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; import { URL } from "url"; -@suite(timeout(10000), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) +@suite(timeout(10000), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) class TestBitbucketServerContextParser { protected parser: BitbucketServerContextParser; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts index 2bbae16e5b24cc..c5c24d9a5f6226 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts @@ -5,7 +5,6 @@ */ import { Repository, User } from "@gitpod/gitpod-protocol"; -import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -20,7 +19,7 @@ import { TokenProvider } from "../user/token-provider"; import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; -@suite(timeout(10000), retries(1), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) +@suite(timeout(10000), retries(1), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) class TestBitbucketServerFileProvider { protected service: BitbucketServerFileProvider; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts index 00a20db6a4c975..b7ad7224c52015 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts @@ -5,7 +5,6 @@ */ import { User } from "@gitpod/gitpod-protocol"; -import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -20,7 +19,7 @@ import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; import { BitbucketServerRepositoryProvider } from "./bitbucket-server-repository-provider"; -@suite(timeout(10000), retries(0), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) +@suite(timeout(10000), retries(0), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) class TestBitbucketServerRepositoryProvider { protected service: BitbucketServerRepositoryProvider; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts index 0e4f5198604531..d0faa5e0991ca0 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts @@ -4,7 +4,6 @@ * See License.AGPL.txt in the project root for license information. */ -import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -15,12 +14,12 @@ import { BitbucketServerTokenHelper } from "./bitbucket-server-token-handler"; import { TokenProvider } from "../user/token-provider"; import { IGitTokenValidatorParams } from "../workspace/git-token-validator"; -const shouldSkip = - ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ") && - ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE") && - ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"); +// const shouldSkip = +// ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ") && +// ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE") && +// ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"); -@suite(timeout(10000), retries(0), skip(shouldSkip)) +@suite(timeout(10000), retries(0), skip(true) /*skip(shouldSkip)*/) class TestBitbucketServerTokenValidator { static readonly AUTH_HOST_CONFIG: Partial = { id: "MyBitbucketServer", @@ -69,7 +68,8 @@ class TestBitbucketServerTokenValidator { return container.get(BitbucketServerTokenValidator); } - @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"))) async test_checkWriteAccess_read_only() { + @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"))*/) + async test_checkWriteAccess_read_only() { const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"]!; const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token })); expect(result).to.deep.equal({ @@ -79,7 +79,7 @@ class TestBitbucketServerTokenValidator { }); } - @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"))) + @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"))*/) async test_checkWriteAccess_write_permissions() { const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"]!; const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token })); @@ -90,7 +90,7 @@ class TestBitbucketServerTokenValidator { }); } - @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"))) + @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"))*/) async test_checkWriteAccess_admin_permissions() { const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"]!; const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token })); From 9a899ac27c8c0dcb582e27e3d6ac161d0e929ffa Mon Sep 17 00:00:00 2001 From: iQQBot Date: Wed, 23 Jul 2025 16:53:20 +0000 Subject: [PATCH 3/3] Revert "[server] Temporarily disable broken bitbucket tests" This reverts commit 1f9e9e8f37a52d0b6c37d8e58ff9a8e507961585. --- .../bitbucket-server-api.spec.ts | 3 ++- .../bitbucket-server-context-parser.spec.ts | 3 ++- .../bitbucket-server-file-provider.spec.ts | 3 ++- ...itbucket-server-repository-provider.spec.ts | 3 ++- .../bitbucket-server-token-validator.spec.ts | 18 +++++++++--------- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts index 68563bbdff0a5b..63071f2a7981e8 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-api.spec.ts @@ -5,6 +5,7 @@ */ import { User } from "@gitpod/gitpod-protocol"; +import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -18,7 +19,7 @@ import { TokenProvider } from "../user/token-provider"; import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; -@suite(timeout(10000), retries(0), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) +@suite(timeout(10000), retries(0), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) class TestBitbucketServerApi { protected api: BitbucketServerApi; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts index a71bdaf5e07b9c..d2ff2a17fa45a0 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-context-parser.spec.ts @@ -5,6 +5,7 @@ */ import { User } from "@gitpod/gitpod-protocol"; +import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -20,7 +21,7 @@ import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; import { URL } from "url"; -@suite(timeout(10000), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) +@suite(timeout(10000), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) class TestBitbucketServerContextParser { protected parser: BitbucketServerContextParser; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts index c5c24d9a5f6226..2bbae16e5b24cc 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-file-provider.spec.ts @@ -5,6 +5,7 @@ */ import { Repository, User } from "@gitpod/gitpod-protocol"; +import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -19,7 +20,7 @@ import { TokenProvider } from "../user/token-provider"; import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; -@suite(timeout(10000), retries(1), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) +@suite(timeout(10000), retries(1), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) class TestBitbucketServerFileProvider { protected service: BitbucketServerFileProvider; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts index b7ad7224c52015..00a20db6a4c975 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts @@ -5,6 +5,7 @@ */ import { User } from "@gitpod/gitpod-protocol"; +import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -19,7 +20,7 @@ import { BitbucketServerApi } from "./bitbucket-server-api"; import { HostContextProvider } from "../auth/host-context-provider"; import { BitbucketServerRepositoryProvider } from "./bitbucket-server-repository-provider"; -@suite(timeout(10000), retries(0), skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))*/) +@suite(timeout(10000), retries(0), skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER"))) class TestBitbucketServerRepositoryProvider { protected service: BitbucketServerRepositoryProvider; protected user: User; diff --git a/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts b/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts index d0faa5e0991ca0..0e4f5198604531 100644 --- a/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts +++ b/components/server/src/bitbucket-server/bitbucket-server-token-validator.spec.ts @@ -4,6 +4,7 @@ * See License.AGPL.txt in the project root for license information. */ +import { ifEnvVarNotSet } from "@gitpod/gitpod-protocol/lib/util/skip-if"; import { Container, ContainerModule } from "inversify"; import { retries, skip, suite, test, timeout } from "@testdeck/mocha"; import { expect } from "chai"; @@ -14,12 +15,12 @@ import { BitbucketServerTokenHelper } from "./bitbucket-server-token-handler"; import { TokenProvider } from "../user/token-provider"; import { IGitTokenValidatorParams } from "../workspace/git-token-validator"; -// const shouldSkip = -// ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ") && -// ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE") && -// ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"); +const shouldSkip = + ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ") && + ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE") && + ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"); -@suite(timeout(10000), retries(0), skip(true) /*skip(shouldSkip)*/) +@suite(timeout(10000), retries(0), skip(shouldSkip)) class TestBitbucketServerTokenValidator { static readonly AUTH_HOST_CONFIG: Partial = { id: "MyBitbucketServer", @@ -68,8 +69,7 @@ class TestBitbucketServerTokenValidator { return container.get(BitbucketServerTokenValidator); } - @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"))*/) - async test_checkWriteAccess_read_only() { + @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"))) async test_checkWriteAccess_read_only() { const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_READ"]!; const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token })); expect(result).to.deep.equal({ @@ -79,7 +79,7 @@ class TestBitbucketServerTokenValidator { }); } - @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"))*/) + @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"))) async test_checkWriteAccess_write_permissions() { const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_WRITE"]!; const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token })); @@ -90,7 +90,7 @@ class TestBitbucketServerTokenValidator { }); } - @test(skip(true) /*skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"))*/) + @test(skip(ifEnvVarNotSet("GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"))) async test_checkWriteAccess_admin_permissions() { const token = process.env["GITPOD_TEST_TOKEN_BITBUCKET_SERVER_ADMIN"]!; const result = await this.getValidator(token).checkWriteAccess(Object.assign({}, this.checkParams, { token }));