Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update sqlserver windows test env #17086

Closed
wants to merge 5 commits into from
Closed

update sqlserver windows test env #17086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97bf6cf
add sqlserver 2022 to windows test env
lu-zhengda Mar 6, 2024
6ee0550
run sqlserver win tests on windows 2022
lu-zhengda Mar 6, 2024
bbc1bab
set isolation: hyperv
lu-zhengda Mar 7, 2024
11fbb02
update win test
lu-zhengda Mar 7, 2024
0387ecb
add sqlserver 2017 on win
lu-zhengda Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ddev/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ runners = { linux = ["ubuntu-20.04"] }

[overrides.ci.sqlserver]
platforms = ["windows", "linux"]
runners = { windows = ["windows-2019"] }

[overrides.ci.tcp_check]
platforms = ["linux", "windows"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2905,7 +2905,7 @@ jobs:
job-name: SQL Server on Windows
target: sqlserver
platform: windows
runner: '["windows-2019"]'
runner: '["windows-2022"]'
repo: "${{ inputs.repo }}"
python-version: "${{ inputs.python-version }}"
standard: ${{ inputs.standard }}
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/meta/ci/testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ To override the runners for each platform, one can set the `overrides.ci.<TARGET

```toml
[overrides.ci.sqlserver]
runners = { windows = ["windows-2019"] }
runners = { windows = ["windows-2022"] }
```

### Exclusion
Expand Down
10 changes: 5 additions & 5 deletions sqlserver/hatch.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ setup = ["single", "ha"]
python = ["3.11"]
os = ["windows"]
driver = ["SQLOLEDB", "SQLNCLI11", "MSOLEDBSQL", "odbc"]
version = ["2019"]
version = ["2017", "2019"]
setup = ["single"]

# The high cardinality environment is meant to be used for local dev/testing
# for example, when we want to do performance testing on local changes to the metrics
# query, we can do that by uncommenting this env setup. Note, you should make sure to set you
# DD_API_KEY in order to send the related metrics to staging for evaluation.
#[[envs.default.matrix]]
#python = ["3.9"]
#python = ["3.11"]
#os = ["linux"]
#driver = ["odbc"]
#version = ["2019", "2022"]
Expand Down Expand Up @@ -54,9 +54,9 @@ matrix.setup.env-vars = [
matrix.version.env-vars = [
{ key = "SQLSERVER_MAJOR_VERSION" },
{ key = "SQLSERVER_ENGINE_EDITION" },
{ key = "SQLSERVER_IMAGE_TAG", value = "2017-CU24-ubuntu-16.04", if = ["2017"], platform = ["linux"] },
{ key = "SQLSERVER_IMAGE_TAG", value = "2019-CU11-ubuntu-16.04", if = ["2019"], platform = ["linux"] },
{ key = "SQLSERVER_IMAGE_TAG", value = "2022-CU9-ubuntu-20.04", if = ["2022"], platform = ["linux"] },
{ key = "SQLSERVER_IMAGE_TAG", value = "2017-latest", if = ["2017"], platform = ["linux"] },
{ key = "SQLSERVER_IMAGE_TAG", value = "2019-latest", if = ["2019"], platform = ["linux"] },
{ key = "SQLSERVER_IMAGE_TAG", value = "2022-latest", if = ["2022"], platform = ["linux"] },
{ key = "SQLSERVER_BASE_IMAGE", value = "datadog/docker-library:sqlserver_{matrix:version}", platform = ["windows"] },
]
matrix.driver.env-vars = [
Expand Down
1 change: 1 addition & 0 deletions sqlserver/tests/compose-high-cardinality-windows/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ services:
dockerfile: Dockerfile
args:
- SQLSERVER_BASE_IMAGE=${SQLSERVER_BASE_IMAGE}
isolation: hyperv
ports:
- "1433:1433"
1 change: 1 addition & 0 deletions sqlserver/tests/compose-windows/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ services:
dockerfile: Dockerfile
args:
- SQLSERVER_BASE_IMAGE=${SQLSERVER_BASE_IMAGE}
isolation: hyperv
ports:
- "1433:1433"
4 changes: 2 additions & 2 deletions sqlserver/tests/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,8 @@ def test_connection_failure(aggregator, dd_run_check, instance_docker):
"failed_tcp_connection",
{"host": "localhost,9999"},
{
"odbc-windows|MSOLEDBSQL": "TCP Provider: No connection could be made"
" because the target machine actively refused it",
"odbc-windows|MSOLEDBSQL": "TCP-connection\\(ERROR: No connection could be made "
"because the target machine actively refused it\\).*",
"SQLOLEDB|SQLNCLI11": "TCP-connection\\(ERROR: No connection could be made "
"because the target machine actively refused it\\).*"
"could not open database requested by login",
Expand Down
Loading