CI-test on Ubuntu 24.04 is added.

dmitry-lipetsk · dmitry-lipetsk · commit bcb77713fb05 · 2025-02-27T17:40:37.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -20,23 +20,17 @@ notifications:
         on_failure: always
 
 env:
-    - PYTHON_VERSION=3 PG_VERSION=17
-    - PYTHON_VERSION=3 PG_VERSION=16
-    - PYTHON_VERSION=3 PG_VERSION=15
-    - PYTHON_VERSION=3 PG_VERSION=14
-    - PYTHON_VERSION=3 PG_VERSION=13
-    - PYTHON_VERSION=3 PG_VERSION=12
-    - PYTHON_VERSION=3 PG_VERSION=11
-    - PYTHON_VERSION=3 PG_VERSION=10
-#    - PYTHON_VERSION=3 PG_VERSION=9.6
-#    - PYTHON_VERSION=3 PG_VERSION=9.5
-#    - PYTHON_VERSION=3 PG_VERSION=9.4
-#    - PYTHON_VERSION=2 PG_VERSION=10
-#    - PYTHON_VERSION=2 PG_VERSION=9.6
-#    - PYTHON_VERSION=2 PG_VERSION=9.5
-#    - PYTHON_VERSION=2 PG_VERSION=9.4
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=17
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=16
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=15
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=14
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=13
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=12
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=11
+    - TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=10
+    - TEST_PLATFORM=ubuntu-24_04 PYTHON_VERSION=3 PG_VERSION=17
 
 matrix:
     allow_failures:
-        - env: PYTHON_VERSION=3 PG_VERSION=11
-        - env: PYTHON_VERSION=3 PG_VERSION=10
+        - env: TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=11
+        - env: TEST_PLATFORM=std PYTHON_VERSION=3 PG_VERSION=10
diff --git a/Dockerfile--std.tmpl b/Dockerfile--std.tmpl
diff --git a/Dockerfile--ubuntu-24_04.tmpl b/Dockerfile--ubuntu-24_04.tmpl
@@ -12,7 +12,7 @@ RUN curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail http
 # RUN sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
 RUN apt update
-RUN apt install -y postgresql-17
+RUN apt install -y postgresql-${PG_VERSION}
 
 RUN apt install -y python3 python3-dev python3-virtualenv
 # RUN apt install -y mc
@@ -69,4 +69,4 @@ chmod 600 ~/.ssh/authorized_keys; \
 echo ----; \
 ls -la ~/.ssh/; \
 echo ----; \
-bash /pg/testgres/run_tests.sh;"
+PYTHON_VERSION=${PYTHON_VERSION} bash /pg/testgres/run_tests.sh;"
diff --git a/mk_dockerfile.sh b/mk_dockerfile.sh
@@ -1,2 +1,2 @@
 set -eu
-sed -e 's/${PYTHON_VERSION}/'${PYTHON_VERSION}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl > Dockerfile
+sed -e 's/${PYTHON_VERSION}/'${PYTHON_VERSION}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile--${TEST_PLATFORM}.tmpl > Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`set -eu`
`2`		`-sed -e 's/${PYTHON_VERSION}/'${PYTHON_VERSION}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl > Dockerfile`
	`2`	`+sed -e 's/${PYTHON_VERSION}/'${PYTHON_VERSION}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile--${TEST_PLATFORM}.tmpl > Dockerfile`