Skip to content

Commit bb6a3b5

Browse files
committed
SNOW-2306184: config refactor - e2e fix attempt 5
1 parent d9faa90 commit bb6a3b5

File tree

9 files changed

+494
-0
lines changed

9 files changed

+494
-0
lines changed

.github/workflows/test.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
os: ${{ fromJSON(needs.define-matrix.outputs.os) }}
2929
python-version: ${{ fromJSON(needs.define-matrix.outputs.python) }}
3030
runs-on: ${{ matrix.os }}
31+
env:
32+
PYTEST_ADDOPTS: -k legacy
3133
steps:
3234
- uses: actions/checkout@v4
3335
with:
@@ -69,3 +71,4 @@ jobs:
6971
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24
7072
env:
7173
SNOWFLAKE_CLI_CONFIG_V2_ENABLED: 1
74+
PYTEST_ADDOPTS: -k config_ng

.github/workflows/test_e2e.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
python-env: e2e
4545
hatch-run: e2e:test
4646
secrets: inherit
47+
env:
48+
PYTEST_ADDOPTS: -k legacy
4749

4850
# Repo owner has commented /ok-to-test on a (fork-based) pull request
4951
e2e-fork:
@@ -71,3 +73,5 @@ jobs:
7173
hatch-run: e2e:test
7274
job-name: e2e-fork
7375
secrets: inherit
76+
env:
77+
PYTEST_ADDOPTS: -k legacy

.github/workflows/test_integration.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
python-env: integration
4646
hatch-run: integration:test
4747
secrets: inherit
48+
env:
49+
PYTEST_ADDOPTS: -k legacy
4850

4951
integration-fork:
5052
needs: define-matrix
@@ -71,3 +73,5 @@ jobs:
7173
hatch-run: integration:test
7274
job-name: integration-fork
7375
secrets: inherit
76+
env:
77+
PYTEST_ADDOPTS: -k legacy

.github/workflows/test_trusted.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ permissions:
2323
jobs:
2424
tests-trusted:
2525
runs-on: ${{ inputs.runs-on }}
26+
env:
27+
PYTEST_ADDOPTS: -k legacy
2628
steps:
2729
- uses: actions/checkout@v4
2830
with:
@@ -51,6 +53,7 @@ jobs:
5153
runs-on: ${{ inputs.runs-on }}
5254
env:
5355
SNOWFLAKE_CLI_CONFIG_V2_ENABLED: 1
56+
PYTEST_ADDOPTS: -k config_ng
5457
steps:
5558
- uses: actions/checkout@v4
5659
with:

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ markers = [
198198
"integration_experimental: experimental integration test",
199199
"no_qa: mark test as not to be run in QA",
200200
"qa_only: mark test as to be run only in QA",
201+
"config_ng: mark test as using new config system",
202+
"legacy: mark test as using legacy config system",
201203
]
202204

203205

0 commit comments

Comments
 (0)