From b6bf3902bf86732705542396785614b0758bbdcb Mon Sep 17 00:00:00 2001 From: Hayden Spitzley <105455169+hspitzley-czi@users.noreply.github.com> Date: Tue, 2 Jul 2024 13:08:10 -0600 Subject: [PATCH] chore: allow smoke tests to be a required check (#1016) --- .github/workflows/argus-stack-staging-upsert.yaml | 15 +++++++++++---- .infra/common.yaml | 2 ++ .infra/rdev/values.yaml | 2 +- .infra/staging/values.yaml | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/argus-stack-staging-upsert.yaml b/.github/workflows/argus-stack-staging-upsert.yaml index 1df68a9b7..c1884ae2b 100644 --- a/.github/workflows/argus-stack-staging-upsert.yaml +++ b/.github/workflows/argus-stack-staging-upsert.yaml @@ -1,10 +1,7 @@ name: Update staging on: - pull_request: - paths: - - '.infra/common.yaml' - - '.infra/staging/values.yaml' + - pull_request concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -13,12 +10,22 @@ concurrency: jobs: run_if: if: github.head_ref == 'release-please--branches--main' + outputs: + changes: ${{ steps.filter.outputs.staging_config }} runs-on: [ARM64, self-hosted, Linux] steps: - run: echo "The head branch of this PR is the release please branch" + - uses: dorny/paths-filter@v3 + id: filter + with: + filters: | + staging_config: + - '.infra/common.yaml' + - '.infra/staging/values.yaml' staging_stack_upsert: needs: run_if + if: needs.run_if.outputs.changes == 'true' runs-on: [ARM64, self-hosted, Linux] permissions: id-token: write diff --git a/.infra/common.yaml b/.infra/common.yaml index 92beda5ee..d82c55e2b 100644 --- a/.infra/common.yaml +++ b/.infra/common.yaml @@ -10,9 +10,11 @@ stack: livenessProbe: httpGet: path: /cellxgene/health + timeoutSeconds: 30 readinessProbe: httpGet: path: /cellxgene/health + timeoutSeconds: 30 services: explorer: serviceAccount: diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml index e580cdb43..2879c5fd6 100644 --- a/.infra/rdev/values.yaml +++ b/.infra/rdev/values.yaml @@ -2,7 +2,7 @@ stack: services: explorer: image: - tag: sha-8b84e9b3 + tag: sha-ac8da63f replicaCount: 1 env: # env vars common to all deployment stages diff --git a/.infra/staging/values.yaml b/.infra/staging/values.yaml index 4b29bd787..b3825474b 100644 --- a/.infra/staging/values.yaml +++ b/.infra/staging/values.yaml @@ -10,10 +10,10 @@ stack: resources: limits: cpu: 4 - memory: 24Gi + memory: 12Gi requests: cpu: 2 - memory: 8Gi + memory: 4Gi env: # env vars common to all deployment stages - name: AWS_REGION