Skip to content

Commit

Permalink
update integration.yml to align with other adapters
Browse files Browse the repository at this point in the history
  • Loading branch information
mikealfare committed Nov 2, 2023
1 parent 01b0c0c commit d3d2844
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This will run for all PRs, when code is pushed to a release
# branch, and when manually triggered.

name: Integration tests
name: Adapter Integration Tests

on:
push:
Expand Down Expand Up @@ -49,7 +49,6 @@ jobs:
github.event.pull_request.head.repo.full_name == github.repository ||
contains(github.event.pull_request.labels.*.name, 'ok to test')
runs-on: ubuntu-latest

outputs:
matrix: ${{ steps.generate-matrix.outputs.result }}

Expand Down Expand Up @@ -86,7 +85,7 @@ jobs:
- 'dev-requirements.txt'
local-tests:
name: test spark local against python ${{ matrix.python-version }}
name: ${{ matrix.test }} / python ${{ matrix.python-version }} / ubuntu-latest

# run if not a PR from a forked repository or has a label to mark as safe to test
# also checks that the matrix generated is not empty
Expand All @@ -96,7 +95,6 @@ jobs:
github.event.pull_request.head.repo.full_name == github.repository ||
contains(github.event.pull_request.labels.*.name, 'ok to test')
)
runs-on: ubuntu-latest

strategy:
Expand All @@ -109,7 +107,8 @@ jobs:
- "spark-session"

env:
PYTEST_ADDOPTS: "-v --color=yes --csv test_results.csv"
TOXENV: integration-${{ matrix.test }}
PYTEST_ADDOPTS: "-v --color=yes --csv integration_results.csv"
DBT_INVOCATION_ENV: github-actions
DD_CIVISIBILITY_AGENTLESS_ENABLED: true
DD_API_KEY: ${{ secrets.DATADOG_API_KEY }}
Expand All @@ -124,7 +123,7 @@ jobs:
with:
persist-credentials: false

# explicity checkout the branch for the PR,
# explicitly checkout the branch for the PR,
# this is necessary for the `pull_request` event
- name: Check out the repository (PR)
if: github.event_name == 'pull_request_target'
Expand Down Expand Up @@ -156,11 +155,12 @@ jobs:
with:
compose-file: "./docker-compose.yml"

- name: Run tox for Spark ${{ matrix.test }}
run: tox -e integration-${{ matrix.test }}
- name: Run tox for ${{ matrix.test }}
run: tox -- --ddtrace

databricks-tests:
name: run ${{ matrix.test }} against python ${{ matrix.python-version }}
name: ${{ matrix.test }} / python ${{ matrix.python-version }} / ubuntu-latest

# run if not a PR from a forked repository or has a label to mark as safe to test
# also checks that the matrix generated is not empty
if: >-
Expand All @@ -182,6 +182,7 @@ jobs:
- "spark-databricks-http"

env:
TOXENV: integration-${{ matrix.test }}
PYTEST_ADDOPTS: "-v --color=yes --csv test_results.csv"
DBT_INVOCATION_ENV: github-actions
DD_CIVISIBILITY_AGENTLESS_ENABLED: true
Expand All @@ -205,7 +206,7 @@ jobs:
with:
persist-credentials: false

# explicity checkout the branch for the PR,
# explicitly checkout the branch for the PR,
# this is necessary for the `pull_request_target` event
- name: Check out the repository (PR)
if: github.event_name == 'pull_request_target'
Expand Down Expand Up @@ -237,5 +238,5 @@ jobs:
run: |
./.github/scripts/configure_odbc.sh
- name: Run tox for Spark ${{ matrix.test }}
run: tox -e integration-${{ matrix.test }}
- name: Run tox for ${{ matrix.test }}
run: tox -- --ddtrace

0 comments on commit d3d2844

Please sign in to comment.