From f10d316d711884c3a4e662469ac177d0728a56d3 Mon Sep 17 00:00:00 2001 From: Colin Rogers <111200756+colin-rogers-dbt@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:36:24 -0800 Subject: [PATCH] Update release-internal.yml to use hatch (#972) * Update release-internal.yml to use hatch * Update release-internal.yml * fix precommit infraction --- .github/workflows/release-internal.yml | 68 ++++---------------------- 1 file changed, 10 insertions(+), 58 deletions(-) diff --git a/.github/workflows/release-internal.yml b/.github/workflows/release-internal.yml index b6e4d4a86..a3496e57c 100644 --- a/.github/workflows/release-internal.yml +++ b/.github/workflows/release-internal.yml @@ -51,8 +51,6 @@ jobs: name: 'Unit Tests' runs-on: ubuntu-latest needs: job-setup - env: - TOXENV: unit steps: - name: "Checkout provided ref, default to branch main" @@ -68,20 +66,19 @@ jobs: - name: "Install Python Dependencies" run: | python -m pip install --user --upgrade pip - python -m pip install tox python -m pip --version - python -m tox --version + + - name: "Install python dependencies" + uses: pypa/hatch@install - name: "Run Tests" - run: tox + run: hatch run unit-tests integration-tests: name: 'Integration Tests' runs-on: ubuntu-latest needs: unit-tests env: - TOXENV: integration-redshift - PYTEST_ADDOPTS: "-v --color=yes -n4" DBT_INVOCATION_ENV: github-actions steps: - name: "Checkout provided ref, default to branch main" @@ -98,8 +95,9 @@ jobs: run: | python -m pip install --user --upgrade pip python -m pip --version - python -m pip install tox - tox --version + + - name: "Install python dependencies" + uses: pypa/hatch@install - name: "Create AWS IAM profiles" run: | @@ -128,53 +126,7 @@ jobs: AWS_ROLE_ARN: ${{ secrets.REDSHIFT_TEST_IAM_ROLE_ARN }} AWS_REGION: ${{ vars.REDSHIFT_TEST_REGION }} - - name: "Run tox" - env: - REDSHIFT_TEST_DBNAME: ${{ secrets.REDSHIFT_TEST_DBNAME }} - REDSHIFT_TEST_PASS: ${{ secrets.REDSHIFT_TEST_PASS }} - REDSHIFT_TEST_USER: ${{ secrets.REDSHIFT_TEST_USER }} - REDSHIFT_TEST_PORT: ${{ secrets.REDSHIFT_TEST_PORT }} - REDSHIFT_TEST_HOST: ${{ secrets.REDSHIFT_TEST_HOST }} - REDSHIFT_TEST_REGION: ${{ vars.REDSHIFT_TEST_REGION }} - REDSHIFT_TEST_CLUSTER_ID: ${{ vars.REDSHIFT_TEST_CLUSTER_ID }} - REDSHIFT_TEST_IAM_USER_PROFILE: ${{ vars.REDSHIFT_TEST_IAM_USER_PROFILE }} - REDSHIFT_TEST_IAM_USER_ACCESS_KEY_ID: ${{ vars.REDSHIFT_TEST_IAM_USER_ACCESS_KEY_ID }} - REDSHIFT_TEST_IAM_USER_SECRET_ACCESS_KEY: ${{ secrets.REDSHIFT_TEST_IAM_USER_SECRET_ACCESS_KEY }} - REDSHIFT_TEST_IAM_ROLE_PROFILE: ${{ vars.REDSHIFT_TEST_IAM_ROLE_PROFILE }} - DBT_TEST_USER_1: dbt_test_user_1 - DBT_TEST_USER_2: dbt_test_user_2 - DBT_TEST_USER_3: dbt_test_user_3 - run: tox -- -m "not flaky" - - integration-tests-flaky: - name: 'Integration Tests (flaky)' - runs-on: ubuntu-latest - needs: integration-tests - - env: - TOXENV: integration-redshift - PYTEST_ADDOPTS: "-v --color=yes -n1" - DBT_INVOCATION_ENV: github-actions - - steps: - - name: "Checkout provided ref, default to branch main" - uses: actions/checkout@v4 - with: - ref: "${{ inputs.ref }}" - - - name: "Set up Python - ${{ env.PYTHON_TARGET_VERSION }}" - uses: actions/setup-python@v5 - with: - python-version: ${{ env.PYTHON_TARGET_VERSION }} - - - name: "Install Python Dependencies" - run: | - python -m pip install --user --upgrade pip - python -m pip --version - python -m pip install tox - tox --version - - - name: "Run tox" + - name: "Run tests" env: REDSHIFT_TEST_DBNAME: ${{ secrets.REDSHIFT_TEST_DBNAME }} REDSHIFT_TEST_PASS: ${{ secrets.REDSHIFT_TEST_PASS }} @@ -190,10 +142,10 @@ jobs: DBT_TEST_USER_1: dbt_test_user_1 DBT_TEST_USER_2: dbt_test_user_2 DBT_TEST_USER_3: dbt_test_user_3 - run: tox -- -m flaky + run: hatch run integration-tests tests/functional -m "not flaky" call-release-workflow: - needs: [unit-tests, integration-tests, integration-tests-flaky] + needs: [unit-tests, integration-tests] name: "Create cloud release" uses: "dbt-labs/dbt-release/.github/workflows/internal-archive-release.yml@main"