Support of multiple Python versions in integration tests

yandex · Aug 7, 2023 · cf11773 · cf11773
1 parent 617a24a
commit cf11773
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
@@ -34,32 +34,41 @@ jobs:
       run: make bandit
 
   test:
-    name: test (Python ${{ matrix.target.python }}, ClickHouse ${{ matrix.clickhouse }})
+    name: test (Python ${{ matrix.python }}, ClickHouse ${{ matrix.clickhouse }})
     needs: lint
     strategy:
       fail-fast: false
       matrix:
-        target:
-        - python: "3.6"
-          ubuntu: "20.04"
-        - python: "3.10"
-          ubuntu: "22.04"
-        - python: "3.11"
-          ubuntu: "latest"
-        clickhouse:
-        - "21.8.15.7"
-        - "22.3.20.29"
-        - "22.8.20.11"
-        - "23.3.8.21"
-        - "latest"
-    runs-on: ubuntu-${{ matrix.target.ubuntu }}
+        include:
+        - ubuntu: "18.04"
+          python: "3.6"
+          clickhouse: "latest"
+        - ubuntu: "20.04"
+          python: "3.8"
+          clickhouse: "latest"
+        - ubuntu: "22.04"
+          python: "3.10"
+          clickhouse: "21.8.15.7"
+        - ubuntu: "22.04"
+          python: "3.10"
+          clickhouse: "22.3.20.29"
+        - ubuntu: "22.04"
+          python: "3.10"
+          clickhouse: "22.8.20.11"
+        - ubuntu: "22.04"
+          python: "3.10"
+          clickhouse: "23.3.8.21"
+        - ubuntu: "22.04"
+          python: "3.10"
+          clickhouse: "latest"
+    runs-on: ubuntu-${{ matrix.ubuntu }}
     steps:
     - uses: actions/checkout@v3
-    - name: set up python ${{ matrix.target.python }}
+    - name: set up python ${{ matrix.python }}
       uses: actions/setup-python@v4
       with:
-        python-version: ${{ matrix.target.python }}
+        python-version: ${{ matrix.python }}
     - name: run unit tests
       run: make test-unit
     - name: run integration tests
-      run: CLICKHOUSE_VERSION=${{ matrix.clickhouse }} make test-integration
+      run: UBUNTU_VERSION=${{ matrix.ubuntu }} CLICKHOUSE_VERSION=${{ matrix.clickhouse }} make test-integration
diff --git a/images/clickhouse/Dockerfile b/images/clickhouse/Dockerfile
@@ -1,9 +1,10 @@
-FROM ubuntu:bionic
+ARG UBUNTU_VERSION=22.04
+ARG CLICKHOUSE_VERSION=latest
 
-ENV TZ=Europe/Moscow
-ENV CH_TMP_DIR /var/tmp/ch-backup
+FROM ubuntu:$UBUNTU_VERSION
 
-ARG CLICKHOUSE_VERSION=latest
+ENV TZ=Europe/Moscow
+ENV CH_TMP_DIR=/var/tmp/ch-backup
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
     apt-get update -qq && \