File tree 5 files changed +13
-7
lines changed
generate_workflows_lib/src/generate_workflows_lib
tests/opentelemetry-docker-tests/tests
5 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -46,13 +46,11 @@ jobs:
46
46
- name: Checkout pull request
47
47
run: git checkout ${% raw %} {{ github.event.pull_request.head.sha }}{% endraw %}
48
48
{% - endif %}
49
- {% - if job_data != "shellcheck" %}
50
49
51
50
- name: Set up Python 3.10
52
51
uses: actions/setup-python@v5
53
52
with:
54
53
python-version: "3.10"
55
- {% - endif %}
56
54
57
55
- name: Install tox
58
56
run: pip install tox
Original file line number Diff line number Diff line change @@ -122,6 +122,11 @@ jobs:
122
122
- name : Checkout repo @ SHA - ${{ github.sha }}
123
123
uses : actions/checkout@v4
124
124
125
+ - name : Set up Python 3.10
126
+ uses : actions/setup-python@v5
127
+ with :
128
+ python-version : " 3.10"
129
+
125
130
- name : Install tox
126
131
run : pip install tox
127
132
Original file line number Diff line number Diff line change @@ -112,9 +112,9 @@ def check_redis_connection():
112
112
113
113
def new_mssql_connection () -> pyodbc .Connection :
114
114
connection = pyodbc .connect (
115
- f"DRIVER={{ODBC Driver 17 for SQL Server}};SERVER={ MSSQL_HOST } ,"
116
- f"{ MSSQL_PORT } ;DATABASE=master;UID={ MSSQL_USER } ;"
117
- f"PWD={ MSSQL_PASSWORD } " ,
115
+ f"DRIVER={{ODBC Driver 18 for SQL Server}};SERVER={ MSSQL_HOST } ,"
116
+ f"{ MSSQL_PORT } ;DATABASE=master;UID={ MSSQL_USER } ;TrustServerCertificate=yes; "
117
+ f"PWD={ MSSQL_PASSWORD } ; " ,
118
118
autocommit = True ,
119
119
)
120
120
return connection
Original file line number Diff line number Diff line change 28
28
"user" : os .getenv ("TEST_MSSQL_USER" , "sa" ),
29
29
"password" : os .getenv ("TEST_MSSQL_PASSWORD" , "yourStrong(!)Password" ),
30
30
"database" : os .getenv ("TEST_MSSQL_DATABASE" , "opentelemetry-tests" ),
31
- "driver" : os .getenv ("TEST_MSSQL_DRIVER" , "ODBC+Driver+17+for+SQL+Server" ),
31
+ "driver" : os .getenv ("TEST_MSSQL_DRIVER" , "ODBC+Driver+18+for+SQL+Server" ),
32
+ "trusted_connection" : os .getenv ("TEST_MSSQL_TRUSTED_CONNECTION" , "yes" ),
32
33
}
33
34
34
35
@@ -40,7 +41,7 @@ class MssqlConnectorTestCase(SQLAlchemyTestMixin):
40
41
VENDOR = "mssql"
41
42
SQL_DB = "opentelemetry-tests"
42
43
ENGINE_ARGS = {
43
- "url" : "mssql+pyodbc://%(user)s:%(password)s@%(host)s:%(port)s/%(database)s?driver=%(driver)s"
44
+ "url" : "mssql+pyodbc://%(user)s:%(password)s@%(host)s:%(port)s/%(database)s?driver=%(driver)s&TrustServerCertificate=%(trusted_connection)s "
44
45
% MSSQL_CONFIG
45
46
}
46
47
Original file line number Diff line number Diff line change @@ -1286,6 +1286,8 @@ changedir =
1286
1286
tests/opentelemetry-docker-tests/tests
1287
1287
1288
1288
commands_pre =
1289
+ sh -c " sudo apt update -y && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev unixodbc"
1290
+ python -c " import pyodbc; print(pyodbc.drivers())"
1289
1291
pip install {env:CORE_REPO}\# egg=opentelemetry-api&subdirectory=opentelemetry-api \
1290
1292
{env:CORE_REPO}\# egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions \
1291
1293
{env:CORE_REPO}\# egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk \
You can’t perform that action at this time.
0 commit comments