remove apt commands from tox ini

Signed-off-by: emdneto <[email protected]>
open-telemetry · Oct 15, 2024 · ea51fc4 · ea51fc4
1 parent d0afb43
commit ea51fc4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2
@@ -52,6 +52,10 @@ jobs:
         with:
           python-version: "3.10"
 
+      {%- if job_data == "docker-tests" %}
+      - name: Setup {{ job_data }}
+        run: sudo apt update -y && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev unixodbc
+      {%- endif %}
       - name: Install tox
         run: pip install tox
 

diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -27,7 +27,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-
       - name: Install tox
         run: pip install tox
 
@@ -45,7 +44,9 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-
+      - name: Setup ODBC drivers
+        run: |
+          sudo apt update -y && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev unixodbc
       - name: Install tox
         run: pip install tox
 
@@ -63,7 +64,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-
       - name: Install tox
         run: pip install tox
 
@@ -81,7 +81,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-
       - name: Install tox
         run: pip install tox
 
@@ -105,7 +104,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-
       - name: Install tox
         run: pip install tox
 
@@ -126,7 +124,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-
       - name: Install tox
         run: pip install tox
 

diff --git a/tox.ini b/tox.ini
@@ -1286,8 +1286,6 @@ changedir =
   tests/opentelemetry-docker-tests/tests
 
 commands_pre =
-  sh -c "sudo apt update -y && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev unixodbc"
-  python -c "import pyodbc; print(pyodbc.drivers())"
   pip install {env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api \
               {env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions \
               {env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk \