diff --git a/.github/workflows/reusable_canary.yml b/.github/workflows/reusable_canary.yml index 5981ca2..ee5c8ec 100644 --- a/.github/workflows/reusable_canary.yml +++ b/.github/workflows/reusable_canary.yml @@ -12,6 +12,9 @@ on: environment: required: true type: string + os: + required: true + type: string jobs: Canary: @@ -48,7 +51,7 @@ jobs: if: ${{inputs.branch == 'mainline'}} uses: aws-actions/aws-codebuild-run-build@v1 with: - project-name: ${{inputs.repository}}-${{inputs.branch}}-Canary + project-name: ${{inputs.repository}}-${{inputs.branch}}-${{inputs.os}}-canary hide-cloudwatch-logs: true env-vars-for-codebuild: | TEST_TYPE @@ -59,6 +62,6 @@ jobs: if: ${{inputs.branch == 'release'}} uses: aws-actions/aws-codebuild-run-build@v1 with: - project-name: ${{inputs.repository}}-${{inputs.branch}}-Canary + project-name: ${{inputs.repository}}-${{inputs.branch}}-${{inputs.os}}-canary source-version-override: refs/heads/release hide-cloudwatch-logs: true \ No newline at end of file diff --git a/.github/workflows/reusable_e2e_test.yml b/.github/workflows/reusable_e2e_test.yml new file mode 100644 index 0000000..bc31dea --- /dev/null +++ b/.github/workflows/reusable_e2e_test.yml @@ -0,0 +1,57 @@ +name: "E2E Tests" + +on: + workflow_call: + inputs: + repository: + required: true + type: string + branch: + required: true + type: string + environment: + required: true + type: string + os: + required: true + type: string + +jobs: + E2ETests: + if: (github.repository == 'aws-deadline/${{inputs.repository}}') + name: E2E Tests + runs-on: ubuntu-latest + environment: ${{inputs.environment}} + permissions: + id-token: write + contents: read + steps: + - uses: actions/checkout@v4 + with: + ref: ${{inputs.branch}} + + - name: Configure AWS credentials for release + if: ${{inputs.branch == 'release'}} + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_CODEBUILD_RELEASE_E2E_ROLE }} + aws-region: us-west-2 + mask-aws-account-id: true + + - name: Configure AWS credentials for mainline + if: ${{inputs.branch == 'mainline'}} + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_CODEBUILD_MAINLINE_E2E_ROLE }} + aws-region: us-west-2 + mask-aws-account-id: true + + - name: Run E2E Tests + uses: aws-actions/aws-codebuild-run-build@v1 + with: + project-name: ${{inputs.repository}}-${{inputs.branch}}-${{inputs.os}}-e2e + hide-cloudwatch-logs: true + env-vars-for-codebuild: | + TEST_TYPE + env: + TEST_TYPE: WHEEL \ No newline at end of file diff --git a/.github/workflows/reusable_integration_test.yml b/.github/workflows/reusable_integration_test.yml index b1cdb11..5aa018e 100644 --- a/.github/workflows/reusable_integration_test.yml +++ b/.github/workflows/reusable_integration_test.yml @@ -12,6 +12,9 @@ on: environment: required: true type: string + os: + required: true + type: string jobs: IntegrationTests: @@ -47,7 +50,7 @@ jobs: - name: Run Integration Tests uses: aws-actions/aws-codebuild-run-build@v1 with: - project-name: ${{inputs.repository}}-${{inputs.branch}}-IntegTest + project-name: ${{inputs.repository}}-${{inputs.branch}}-${{inputs.os}}-integ hide-cloudwatch-logs: true env-vars-for-codebuild: | TEST_TYPE