From d3276d91b21c3a240bf0e8df7a2e9d85117b41eb Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 1 May 2025 13:54:33 +0100 Subject: [PATCH 1/6] ci: Migrate GHA to Depot runners --- .github/workflows/.reusable-deploy-ecs.yml | 6 +++--- .github/workflows/.reusable-docker-build.yml | 2 +- .github/workflows/.reusable-docker-publish.yml | 2 +- .github/workflows/.reusable-frontend-deploy.yml | 2 +- .github/workflows/api-tests-with-private-packages.yml | 2 +- .github/workflows/conventional-commit.yml | 2 +- .github/workflows/docs-cron-vercel-deploy.yml | 2 +- .github/workflows/docs-pull-request.yml | 2 +- .github/workflows/frontend-deploy-production.yml | 2 +- .github/workflows/frontend-test-staging.yml | 2 +- .github/workflows/github-labeler.yml | 2 +- .github/workflows/manual-e2e-tests.yml | 2 +- .github/workflows/platform-docker-build-test-publish.yml | 2 +- .github/workflows/platform-docker-trivy-scan.yml | 4 ++-- .github/workflows/platform-pull-request.yml | 6 +++--- .github/workflows/platform-release-please.yml | 2 +- .github/workflows/uffizzi-build.yml | 6 +++--- .github/workflows/uffizzi-preview.yml | 2 +- .github/workflows/update-flagsmith-environment.yml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/.reusable-deploy-ecs.yml b/.github/workflows/.reusable-deploy-ecs.yml index 72e58be119bd..4ac2a5d1c1fe 100644 --- a/.github/workflows/.reusable-deploy-ecs.yml +++ b/.github/workflows/.reusable-deploy-ecs.yml @@ -17,7 +17,7 @@ on: jobs: docker-build-saas-api: environment: ${{ inputs.environment }} - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest outputs: image-url: ${{ steps.login-ecr.outputs.registry }}/${{ inputs.saas-image-name }}:${{ steps.meta.outputs.version }} @@ -70,7 +70,7 @@ jobs: deploy: needs: docker-build-saas-api environment: ${{ inputs.environment }} - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest steps: - name: Cloning repo uses: actions/checkout@v4 @@ -104,7 +104,7 @@ jobs: run-tests: needs: deploy - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest name: Run E2E Tests environment: ${{ inputs.environment }} concurrency: diff --git a/.github/workflows/.reusable-docker-build.yml b/.github/workflows/.reusable-docker-build.yml index 79fab6131f45..09254e9a58d7 100644 --- a/.github/workflows/.reusable-docker-build.yml +++ b/.github/workflows/.reusable-docker-build.yml @@ -71,7 +71,7 @@ on: jobs: build: name: Build ${{ inputs.scan && 'and verify ' || '' }}${{ inputs.image-name }} image - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest outputs: image: ${{ steps.image-tag.outputs.image-tag }} diff --git a/.github/workflows/.reusable-docker-publish.yml b/.github/workflows/.reusable-docker-publish.yml index dde32914ee68..7727ba96a6ee 100644 --- a/.github/workflows/.reusable-docker-publish.yml +++ b/.github/workflows/.reusable-docker-publish.yml @@ -31,7 +31,7 @@ on: jobs: publish: name: Publish ${{ inputs.source-images }} to ${{ inputs.target-images }} - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest permissions: contents: read diff --git a/.github/workflows/.reusable-frontend-deploy.yml b/.github/workflows/.reusable-frontend-deploy.yml index 1749336cfc4f..5a8d5e4770ee 100644 --- a/.github/workflows/.reusable-frontend-deploy.yml +++ b/.github/workflows/.reusable-frontend-deploy.yml @@ -18,7 +18,7 @@ defaults: jobs: deploy: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest environment: ${{ inputs.gh_environment }} permissions: diff --git a/.github/workflows/api-tests-with-private-packages.yml b/.github/workflows/api-tests-with-private-packages.yml index 72e2f63844dc..e223b943be77 100644 --- a/.github/workflows/api-tests-with-private-packages.yml +++ b/.github/workflows/api-tests-with-private-packages.yml @@ -13,7 +13,7 @@ defaults: jobs: test: if: ${{ github.event.label.name == 'api' }} - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest name: API Tests services: diff --git a/.github/workflows/conventional-commit.yml b/.github/workflows/conventional-commit.yml index f05c2a640d12..225ece385b55 100644 --- a/.github/workflows/conventional-commit.yml +++ b/.github/workflows/conventional-commit.yml @@ -7,7 +7,7 @@ on: jobs: conventional-commit: name: Conventional Commit - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest steps: - name: Check PR Conventional Commit title uses: amannn/action-semantic-pull-request@v5 diff --git a/.github/workflows/docs-cron-vercel-deploy.yml b/.github/workflows/docs-cron-vercel-deploy.yml index f24379684fcd..40edc6058ee5 100644 --- a/.github/workflows/docs-cron-vercel-deploy.yml +++ b/.github/workflows/docs-cron-vercel-deploy.yml @@ -7,7 +7,7 @@ on: - cron: '0 12 * * 2' jobs: vercel-deploy: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest steps: - name: Run Vercel deploy hook run: curl -X POST "${{ secrets.VERCEL_SDK_VERSIONS_DEPLOY_HOOKS_URL }}" diff --git a/.github/workflows/docs-pull-request.yml b/.github/workflows/docs-pull-request.yml index d4bc32cbfe32..969ba361ef7d 100644 --- a/.github/workflows/docs-pull-request.yml +++ b/.github/workflows/docs-pull-request.yml @@ -13,7 +13,7 @@ defaults: jobs: checks: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest name: Link Check Docs steps: diff --git a/.github/workflows/frontend-deploy-production.yml b/.github/workflows/frontend-deploy-production.yml index 416e330d6e16..6ca8f55c73f2 100644 --- a/.github/workflows/frontend-deploy-production.yml +++ b/.github/workflows/frontend-deploy-production.yml @@ -10,7 +10,7 @@ on: jobs: run-tests: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest name: Run E2E Tests environment: production concurrency: diff --git a/.github/workflows/frontend-test-staging.yml b/.github/workflows/frontend-test-staging.yml index 4828f38cd794..14be482b461b 100644 --- a/.github/workflows/frontend-test-staging.yml +++ b/.github/workflows/frontend-test-staging.yml @@ -4,7 +4,7 @@ on: workflow_dispatch jobs: run-staging-e2e-tests: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest name: Run E2E Tests environment: staging concurrency: diff --git a/.github/workflows/github-labeler.yml b/.github/workflows/github-labeler.yml index 6a5f31cc5a2c..77b993491b09 100644 --- a/.github/workflows/github-labeler.yml +++ b/.github/workflows/github-labeler.yml @@ -8,7 +8,7 @@ jobs: permissions: contents: read pull-requests: write - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest steps: - name: Run labeler diff --git a/.github/workflows/manual-e2e-tests.yml b/.github/workflows/manual-e2e-tests.yml index 7bf9fec3799e..f4e60d2380ba 100644 --- a/.github/workflows/manual-e2e-tests.yml +++ b/.github/workflows/manual-e2e-tests.yml @@ -16,7 +16,7 @@ on: jobs: run-e2e-tests: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/platform-docker-build-test-publish.yml b/.github/workflows/platform-docker-build-test-publish.yml index 1bbf0650733b..39a3a57e95ff 100644 --- a/.github/workflows/platform-docker-build-test-publish.yml +++ b/.github/workflows/platform-docker-build-test-publish.yml @@ -184,7 +184,7 @@ jobs: update-charts: needs: [docker-publish-api, docker-publish-frontend, docker-publish-unified] - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest steps: - name: Checkout Target Charts Repository to update yaml uses: actions/checkout@v4 diff --git a/.github/workflows/platform-docker-trivy-scan.yml b/.github/workflows/platform-docker-trivy-scan.yml index 8a42647ed5fd..997257c3be13 100644 --- a/.github/workflows/platform-docker-trivy-scan.yml +++ b/.github/workflows/platform-docker-trivy-scan.yml @@ -45,7 +45,7 @@ env: jobs: pull-trivy-db: name: Pull and republish Trivy databases - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest permissions: packages: write @@ -72,7 +72,7 @@ jobs: scan-images: name: Scan image - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest needs: pull-trivy-db permissions: diff --git a/.github/workflows/platform-pull-request.yml b/.github/workflows/platform-pull-request.yml index b44bbb2eeb59..251e213f64f7 100644 --- a/.github/workflows/platform-pull-request.yml +++ b/.github/workflows/platform-pull-request.yml @@ -10,7 +10,7 @@ on: jobs: permissions-check: name: Check actor permissions - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest outputs: can-write: ${{ steps.check.outputs.require-result }} steps: @@ -23,7 +23,7 @@ jobs: if: needs.permissions-check.outputs.can-write == 'true' name: Add Conventional Commit labels needs: permissions-check - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest permissions: pull-requests: write steps: @@ -49,7 +49,7 @@ jobs: if: github.event.pull_request.draft == false && needs.permissions-check.outputs.can-write == 'true' name: Prepare Docker report comment needs: permissions-check - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest permissions: pull-requests: write steps: diff --git a/.github/workflows/platform-release-please.yml b/.github/workflows/platform-release-please.yml index e21bf86df71d..86291a7492ae 100644 --- a/.github/workflows/platform-release-please.yml +++ b/.github/workflows/platform-release-please.yml @@ -11,7 +11,7 @@ permissions: jobs: release-please: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest steps: - uses: googleapis/release-please-action@v4 diff --git a/.github/workflows/uffizzi-build.yml b/.github/workflows/uffizzi-build.yml index 9d45afb69e11..8300be9ec3a9 100644 --- a/.github/workflows/uffizzi-build.yml +++ b/.github/workflows/uffizzi-build.yml @@ -10,7 +10,7 @@ on: jobs: build-flagsmith: name: Build and push `Flagsmith` - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest permissions: id-token: write @@ -50,7 +50,7 @@ jobs: render-compose-file: name: Render Docker Compose File # Pass output of this workflow to another triggered by `workflow_run` event. - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest needs: - build-flagsmith outputs: @@ -76,7 +76,7 @@ jobs: delete-preview: name: Call for Preview Deletion - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest if: ${{ github.event.action == 'closed' }} steps: # If this PR is closing, we will not render a compose file nor pass it to the next workflow. diff --git a/.github/workflows/uffizzi-preview.yml b/.github/workflows/uffizzi-preview.yml index 742c331874ff..81217d74a8e9 100644 --- a/.github/workflows/uffizzi-preview.yml +++ b/.github/workflows/uffizzi-preview.yml @@ -10,7 +10,7 @@ on: jobs: cache-compose-file: name: Cache Compose File - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'success' }} outputs: compose-file-cache-key: ${{ steps.hash.outputs.COMPOSE_FILE_HASH }} diff --git a/.github/workflows/update-flagsmith-environment.yml b/.github/workflows/update-flagsmith-environment.yml index d48c3a52bf63..576b63688001 100644 --- a/.github/workflows/update-flagsmith-environment.yml +++ b/.github/workflows/update-flagsmith-environment.yml @@ -10,7 +10,7 @@ defaults: jobs: update_server_defaults: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-latest name: Update API Flagsmith Defaults env: FLAGSMITH_ON_FLAGSMITH_SERVER_API_URL: https://edge.api.flagsmith.com/api/v1 From 6e219a93b1f18603afa58847db5c4d26d0f7c729 Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 1 May 2025 14:00:19 +0100 Subject: [PATCH 2/6] migrate the rest --- .github/workflows/.reusable-docker-e2e-tests.yml | 4 ++-- .github/workflows/platform-docker-build-test-publish.yml | 2 +- .github/workflows/platform-pull-request.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/.reusable-docker-e2e-tests.yml b/.github/workflows/.reusable-docker-e2e-tests.yml index aab9a7190dc3..b31bbad99acf 100644 --- a/.github/workflows/.reusable-docker-e2e-tests.yml +++ b/.github/workflows/.reusable-docker-e2e-tests.yml @@ -24,9 +24,9 @@ on: default: 3 runs-on: type: string - description: The runner label to use. Defaults to `ubuntu-latest` + description: The runner label to use. Defaults to `depot-ubuntu-latest` required: false - default: ubuntu-latest + default: depot-ubuntu-latest secrets: GCR_TOKEN: description: A token to use for logging into Github Container Registry. If not provided, login does not occur. diff --git a/.github/workflows/platform-docker-build-test-publish.yml b/.github/workflows/platform-docker-build-test-publish.yml index 39a3a57e95ff..c8e3432cebac 100644 --- a/.github/workflows/platform-docker-build-test-publish.yml +++ b/.github/workflows/platform-docker-build-test-publish.yml @@ -81,7 +81,7 @@ jobs: strategy: matrix: - runs-on: [ubuntu-latest, ARM64-2c] + runs-on: [depot-ubuntu-latest, depot-ubuntu-latest-arm] api-image: - ${{ needs.docker-build-api.outputs.image }} - ${{ needs.docker-build-private-cloud-api.outputs.image }} diff --git a/.github/workflows/platform-pull-request.yml b/.github/workflows/platform-pull-request.yml index 251e213f64f7..f081a977b7ac 100644 --- a/.github/workflows/platform-pull-request.yml +++ b/.github/workflows/platform-pull-request.yml @@ -145,7 +145,7 @@ jobs: strategy: matrix: - runs-on: [ubuntu-latest, ARM64-2c] + runs-on: [depot-ubuntu-latest, depot-ubuntu-latest-arm] args: - tests: segment-part-1 environment concurrency: 1 @@ -172,7 +172,7 @@ jobs: strategy: matrix: - runs-on: [ubuntu-latest, ARM64-2c] + runs-on: [depot-ubuntu-latest, depot-ubuntu-latest-arm] args: - tests: organisation-permission environment-permission project-permission roles concurrency: 1 From 201e621e15d6bcf11afea8ab92327c77ec874a7c Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 1 May 2025 14:52:05 +0100 Subject: [PATCH 3/6] update unit tests --- .github/workflows/api-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/api-pull-request.yml b/.github/workflows/api-pull-request.yml index 2c84fb64539c..f397b3349ff2 100644 --- a/.github/workflows/api-pull-request.yml +++ b/.github/workflows/api-pull-request.yml @@ -22,7 +22,7 @@ env: jobs: test: - runs-on: General-Purpose-8c-Runner + runs-on: depot-ubuntu-latest-16 name: API Unit Tests services: From 29d0f28348c71e6b2d5fd4cba3fa3254b3d3337e Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 1 May 2025 15:30:07 +0100 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=8D=B2=20up=20the=20E2E=20jobs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/platform-docker-build-test-publish.yml | 2 +- .github/workflows/platform-pull-request.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/platform-docker-build-test-publish.yml b/.github/workflows/platform-docker-build-test-publish.yml index c8e3432cebac..5ad269543a73 100644 --- a/.github/workflows/platform-docker-build-test-publish.yml +++ b/.github/workflows/platform-docker-build-test-publish.yml @@ -81,7 +81,7 @@ jobs: strategy: matrix: - runs-on: [depot-ubuntu-latest, depot-ubuntu-latest-arm] + runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16] api-image: - ${{ needs.docker-build-api.outputs.image }} - ${{ needs.docker-build-private-cloud-api.outputs.image }} diff --git a/.github/workflows/platform-pull-request.yml b/.github/workflows/platform-pull-request.yml index f081a977b7ac..8f9e7a8fd5ad 100644 --- a/.github/workflows/platform-pull-request.yml +++ b/.github/workflows/platform-pull-request.yml @@ -145,7 +145,7 @@ jobs: strategy: matrix: - runs-on: [depot-ubuntu-latest, depot-ubuntu-latest-arm] + runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16] args: - tests: segment-part-1 environment concurrency: 1 @@ -172,7 +172,7 @@ jobs: strategy: matrix: - runs-on: [depot-ubuntu-latest, depot-ubuntu-latest-arm] + runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16] args: - tests: organisation-permission environment-permission project-permission roles concurrency: 1 From ce77acb16863b544e7a8b22637e7d9b943f5e534 Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 1 May 2025 16:12:08 +0100 Subject: [PATCH 5/6] test default concurrency of 16 --- .github/workflows/platform-docker-build-test-publish.yml | 7 +------ .github/workflows/platform-pull-request.yml | 9 ++------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/platform-docker-build-test-publish.yml b/.github/workflows/platform-docker-build-test-publish.yml index 5ad269543a73..6bcb618bff2d 100644 --- a/.github/workflows/platform-docker-build-test-publish.yml +++ b/.github/workflows/platform-docker-build-test-publish.yml @@ -73,7 +73,7 @@ jobs: runs-on: ${{ matrix.runs-on }} e2e-image: ${{ needs.docker-build-e2e.outputs.image }} api-image: ${{ matrix.api-image }} - concurrency: ${{ matrix.args.concurrency }} + concurrency: ${{ matrix.args.concurrency || 16 }} tests: ${{ matrix.args.tests }} secrets: GCR_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -87,15 +87,10 @@ jobs: - ${{ needs.docker-build-private-cloud-api.outputs.image }} args: - tests: segment-part-1 environment - concurrency: 1 - tests: segment-part-2 - concurrency: 1 - tests: segment-part-3 signup flag invite project - concurrency: 2 - tests: versioning - concurrency: 1 - tests: organisation-permission environment-permission project-permission roles - concurrency: 1 # Publish to dockerhub diff --git a/.github/workflows/platform-pull-request.yml b/.github/workflows/platform-pull-request.yml index 8f9e7a8fd5ad..96a2f90e5550 100644 --- a/.github/workflows/platform-pull-request.yml +++ b/.github/workflows/platform-pull-request.yml @@ -137,7 +137,7 @@ jobs: runs-on: ${{ matrix.runs-on }} e2e-image: ${{ needs.docker-build-e2e.outputs.image }} api-image: ${{ needs.docker-build-api.outputs.image }} - concurrency: ${{ matrix.args.concurrency }} + concurrency: ${{ matrix.args.concurrency || 16 }} tests: ${{ matrix.args.tests }} secrets: GCR_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.GITHUB_TOKEN || '' }} @@ -148,13 +148,9 @@ jobs: runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16] args: - tests: segment-part-1 environment - concurrency: 1 - tests: segment-part-2 - concurrency: 1 - tests: segment-part-3 signup flag invite project - concurrency: 2 - tests: versioning - concurrency: 1 run-e2e-tests-private-cloud: if: needs.permissions-check.outputs.can-write == 'true' && !cancelled() @@ -164,7 +160,7 @@ jobs: runs-on: ${{ matrix.runs-on }} e2e-image: ${{ needs.docker-build-e2e.outputs.image }} api-image: ${{ needs.docker-build-private-cloud.outputs.image }} - concurrency: ${{ matrix.args.concurrency }} + concurrency: ${{ matrix.args.concurrency || 16 }} tests: ${{ matrix.args.tests }} secrets: GCR_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.GITHUB_TOKEN || '' }} @@ -175,4 +171,3 @@ jobs: runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16] args: - tests: organisation-permission environment-permission project-permission roles - concurrency: 1 From e6e954b9fe309e7789e256fdc1e1a23c47bd4cc3 Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 1 May 2025 16:29:19 +0100 Subject: [PATCH 6/6] run all e2e tests in one job --- .../platform-docker-build-test-publish.yml | 9 +----- .github/workflows/platform-pull-request.yml | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/platform-docker-build-test-publish.yml b/.github/workflows/platform-docker-build-test-publish.yml index 6bcb618bff2d..83f1546de3cc 100644 --- a/.github/workflows/platform-docker-build-test-publish.yml +++ b/.github/workflows/platform-docker-build-test-publish.yml @@ -73,8 +73,7 @@ jobs: runs-on: ${{ matrix.runs-on }} e2e-image: ${{ needs.docker-build-e2e.outputs.image }} api-image: ${{ matrix.api-image }} - concurrency: ${{ matrix.args.concurrency || 16 }} - tests: ${{ matrix.args.tests }} + concurrency: 16 secrets: GCR_TOKEN: ${{ secrets.GITHUB_TOKEN }} SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }} @@ -85,12 +84,6 @@ jobs: api-image: - ${{ needs.docker-build-api.outputs.image }} - ${{ needs.docker-build-private-cloud-api.outputs.image }} - args: - - tests: segment-part-1 environment - - tests: segment-part-2 - - tests: segment-part-3 signup flag invite project - - tests: versioning - - tests: organisation-permission environment-permission project-permission roles # Publish to dockerhub diff --git a/.github/workflows/platform-pull-request.yml b/.github/workflows/platform-pull-request.yml index 96a2f90e5550..c5d107f541d5 100644 --- a/.github/workflows/platform-pull-request.yml +++ b/.github/workflows/platform-pull-request.yml @@ -137,8 +137,17 @@ jobs: runs-on: ${{ matrix.runs-on }} e2e-image: ${{ needs.docker-build-e2e.outputs.image }} api-image: ${{ needs.docker-build-api.outputs.image }} - concurrency: ${{ matrix.args.concurrency || 16 }} - tests: ${{ matrix.args.tests }} + concurrency: 16 + tests: >- + segment-part-1 + segment-part-2 + segment-part-3 + environment + signup + flag + invite + project + versioning secrets: GCR_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.GITHUB_TOKEN || '' }} SLACK_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.SLACK_TOKEN || '' }} @@ -146,11 +155,6 @@ jobs: strategy: matrix: runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16] - args: - - tests: segment-part-1 environment - - tests: segment-part-2 - - tests: segment-part-3 signup flag invite project - - tests: versioning run-e2e-tests-private-cloud: if: needs.permissions-check.outputs.can-write == 'true' && !cancelled() @@ -160,8 +164,12 @@ jobs: runs-on: ${{ matrix.runs-on }} e2e-image: ${{ needs.docker-build-e2e.outputs.image }} api-image: ${{ needs.docker-build-private-cloud.outputs.image }} - concurrency: ${{ matrix.args.concurrency || 16 }} - tests: ${{ matrix.args.tests }} + concurrency: 16 + tests: >- + organisation-permission + environment-permission + project-permission + roles secrets: GCR_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.GITHUB_TOKEN || '' }} SLACK_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.SLACK_TOKEN || '' }} @@ -169,5 +177,3 @@ jobs: strategy: matrix: runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16] - args: - - tests: organisation-permission environment-permission project-permission roles