fix env var in test and add v14 test

dttctcs · Feb 27, 2024 · 5cb9dec · 5cb9dec
1 parent dc907e4
commit 5cb9dec
Show file tree

Hide file tree

Showing 3 changed files with 408 additions and 9 deletions.
diff --git a/.github/workflows/spilo_pgversion_14.yaml b/.github/workflows/spilo_pgversion_14.yaml
@@ -1,4 +1,4 @@
-name: Build and publish image to dockerhub
+name: Build and publish v14 image to dockerhub
 on:
   push:
     branches:
@@ -7,8 +7,9 @@ on:
       - '*'
 
 env:
-  PGVERSION: 14
-  IMAGE_NAME: ${{ github.repository }}
+  PGVERSION: "14"
+  PGOLDVERSIONS: "10 11 12 13"
+  IMAGE_NAME: datatactics/dtacs-spilo
   TAG: ${{ github.sha }}
 
 jobs:
@@ -31,9 +32,9 @@ jobs:
     - name: Run flake8
       run: find postgres-appliance -name '*.py' -print0 | xargs -0 python -m flake8
     - name: Build spilo docker image
-      run: cd postgres-appliance && docker build --build-arg PGVERSION=${{ env.PGVERSION }} -t spilo .
+      run: cd postgres-appliance && docker build --build-arg PGOLDVERSIONS=${{ env.PGOLDVERSIONS }} --build-arg PGVERSION=${{ env.PGVERSION }} -t spilo .
     - name: Test spilo docker image
-      run: bash postgres-appliance/tests/test_spilo.sh
+      run: bash postgres-appliance/tests/test_spilo_pg14.sh
     - name: Test USE_OLD_LOCALES
       run: bash -x postgres-appliance/tests/locales_test/test_locales.sh
       if: github.event_name == 'push'
@@ -94,7 +95,7 @@ jobs:
         SPILO_TEST_IMAGE: "${{ steps.image.outputs.NAME }}"
         PGVERSION: ${{ env.PGVERSION }}
       run: |
-        bash postgres-appliance/tests/test_spilo.sh 
+        bash postgres-appliance/tests/test_spilo_pg14.sh 
 
     - name: Build and push to dockerhub
       uses: docker/build-push-action@v3

diff --git a/.github/workflows/spilo_pgversion_15.yaml b/.github/workflows/spilo_pgversion_15.yaml
@@ -1,4 +1,4 @@
-name: Build and publish image to dockerhub
+name: Build and publish v15 image to dockerhub
 on:
   push:
     branches:
@@ -7,7 +7,8 @@ on:
       - '*'
 
 env:
-  PGVERSION: 15
+  PGVERSION: "15"
+  PGOLDVERSIONS: "10 11 12 13 14"
   IMAGE_NAME: ${{ github.repository }}
   TAG: ${{ github.sha }}
 
@@ -31,7 +32,7 @@ jobs:
     - name: Run flake8
       run: find postgres-appliance -name '*.py' -print0 | xargs -0 python -m flake8
     - name: Build spilo docker image
-      run: cd postgres-appliance && docker build --build-arg PGVERSION=${{ env.PGVERSION }} -t spilo .
+      run: cd postgres-appliance && docker build --build-arg PGOLDVERSIONS=${{ env.PGOLDVERSIONS }} --build-arg PGVERSION=${{ env.PGVERSION }} -t spilo .
     - name: Test spilo docker image
       run: bash postgres-appliance/tests/test_spilo.sh
     - name: Test USE_OLD_LOCALES