diff --git a/.github/workflows/integ_test.yml b/.github/workflows/integ_test.yml deleted file mode 100644 index 9aed3d82..00000000 --- a/.github/workflows/integ_test.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Integ Tests - -on: - workflow_dispatch: - -jobs: - Integ: - runs-on: ubuntu-latest - environment: mainline - permissions: - id-token: write - steps: - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: ${{ secrets.AWS_CODEBUILD_MAINLINE_INTEG_ROLE }} - aws-region: us-west-2 - mask-aws-account-id: true - - name: Run CodeBuild - uses: aws-actions/aws-codebuild-run-build@v1 - with: - project-name: deadline-cloud-worker-agent-dev-IntegTest - hide-cloudwatch-logs: true \ No newline at end of file diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/release_integration_canary.yml similarity index 52% rename from .github/workflows/e2e_test.yml rename to .github/workflows/release_integration_canary.yml index 390eaf3e..38565477 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/release_integration_canary.yml @@ -1,23 +1,29 @@ -name: E2E Tests +name: Release Integration Canary on: - workflow_dispatch: + schedule: + - cron: '0 */1 * * *' jobs: - E2E: + Release Integration Canary: runs-on: ubuntu-latest - environment: mainline + environment: release permissions: id-token: write + contents: read + steps: + - uses: actions/checkout@v4 + with: + ref: release steps: - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 with: - role-to-assume: ${{ secrets.AWS_CODEBUILD_MAINLINE_E2E_ROLE }} + role-to-assume: ${{ secrets.AWS_CODEBUILD_RELEASE_INTEG_ROLE }} aws-region: us-west-2 mask-aws-account-id: true - name: Run CodeBuild uses: aws-actions/aws-codebuild-run-build@v1 with: - project-name: deadline-cloud-worker-agent-dev-E2ETest + project-name: deadline-cloud-worker-agent-IntegTest hide-cloudwatch-logs: true \ No newline at end of file diff --git a/hatch.toml b/hatch.toml index cfab7936..807192ed 100644 --- a/hatch.toml +++ b/hatch.toml @@ -40,12 +40,7 @@ PIP_INDEX_URL="https://aws:{env:CODEARTIFACT_AUTH_TOKEN}@{env:CODEARTIFACT_DOMAI [envs.codebuild.scripts] build = "hatch build" +integ-test = "pytest --no-cov test/integ {args}" [envs.codebuild.env-vars] -PIP_INDEX_URL="" - -[envs.integ.scripts] -test = "pytest --no-cov {args:test/integ}" - -[envs.e2e.scripts] -test = "pytest --no-cov {args:test/e2e}" \ No newline at end of file +PIP_INDEX_URL="" \ No newline at end of file diff --git a/pipeline/e2e.sh b/pipeline/e2e.sh deleted file mode 100755 index f026fe3d..00000000 --- a/pipeline/e2e.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# Set the -e option -set -e - -pip install --upgrade pip -pip install --upgrade hatch -hatch run e2e:test \ No newline at end of file diff --git a/pipeline/integ.sh b/pipeline/integ.sh index 232a6f01..dcff1513 100755 --- a/pipeline/integ.sh +++ b/pipeline/integ.sh @@ -4,4 +4,4 @@ set -e pip install --upgrade pip pip install --upgrade hatch -hatch run integ:test \ No newline at end of file +hatch run codebuild:integ-test \ No newline at end of file