run tests on pg16 (#1340)

* run tests on pg16 * nightly packages for deb12 * fix dialpeer deletion tests to allow any argument order
yeti-switch · Sep 21, 2023 · 9a8cbf3 · 9a8cbf3
1 parent e972b7e
commit 9a8cbf3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/nightly-packages.yml b/.github/workflows/nightly-packages.yml
@@ -5,13 +5,13 @@ on:
     branches: [ master ]
 
 jobs:
-  deb11:
-    name: Debian 11 nightly package building
+  deb12:
+    name: Debian 12 nightly package building
     runs-on: ubuntu-latest
-    container: ghcr.io/yeti-switch/yeti-web/build-image:bullseye
+    container: ghcr.io/yeti-switch/yeti-web/build-image:bookworm
     services:
       db:
-        image: ghcr.io/yeti-switch/yeti-web/pgsql:13
+        image: ghcr.io/yeti-switch/yeti-web/pgsql:16
 
     steps:
       - uses: actions/checkout@v2
@@ -33,17 +33,17 @@ jobs:
       - name: Save deb package as artifact
         uses: actions/upload-artifact@v2
         with:
-          name: deb11-package
+          name: deb12-package
           path: /__w/yeti-web/*.deb
 
       - name: Upload package to ${{github.ref}} repo
         env:
           PKG_API_BASE: ${{secrets.PKG_API_BASE}}
-        run: ci/deploy.sh bullseye nightly main ../*.deb
+        run: ci/deploy.sh bookworm nightly main ../*.deb
 
-  deb11_container:
-    name: Debian 11 container
-    needs: deb11
+  deb12_container:
+    name: Debian 12 container
+    needs: deb12
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -53,7 +53,7 @@ jobs:
       - name: Download a single artifact
         uses: actions/download-artifact@v2
         with:
-          name: deb11-package
+          name: deb12-package
 
       - name: Display structure of downloaded files
         run: ls -la

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
     container: ghcr.io/yeti-switch/yeti-web/build-image:bookworm
     services:
       db:
-        image: ghcr.io/yeti-switch/yeti-web/pgsql:13
+        image: ghcr.io/yeti-switch/yeti-web/pgsql:16
 
     steps:
       - uses: actions/checkout@v2
@@ -78,9 +78,9 @@ jobs:
         run: v=${PKG_TAG##*/};major_version=${v%\.[0-9]*};ci/deploy.sh bookworm $major_version main ../*.deb
 
 
-  deb11_container:
-    name: Debian 11 release container
-    needs: deb11
+  deb12_container:
+    name: Debian 12 release container
+    needs: deb12
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -90,7 +90,7 @@ jobs:
       - name: Download a single artifact
         uses: actions/download-artifact@v2
         with:
-          name: deb11-package
+          name: deb12-package
 
       - name: Display structure of downloaded files
         run: ls -la

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -62,7 +62,7 @@ jobs:
     container: ghcr.io/yeti-switch/yeti-web/build-image:bullseye
     services:
       db:
-        image: ghcr.io/yeti-switch/yeti-web/pgsql:13
+        image: ghcr.io/yeti-switch/yeti-web/pgsql:16
     needs: gems-caching
     steps:
       - uses: actions/checkout@v2
@@ -121,7 +121,7 @@ jobs:
     container: ghcr.io/yeti-switch/yeti-web/build-image:bullseye
     services:
       db:
-        image: ghcr.io/yeti-switch/yeti-web/pgsql:13
+        image: ghcr.io/yeti-switch/yeti-web/pgsql:16
 
     needs: gems-caching
     steps:
@@ -150,7 +150,7 @@ jobs:
     container: ghcr.io/yeti-switch/yeti-web/build-image:bullseye
     services:
       db:
-        image: ghcr.io/yeti-switch/yeti-web/pgsql:13
+        image: ghcr.io/yeti-switch/yeti-web/pgsql:16
 
     needs: gems-caching
     strategy:

diff --git a/spec/jobs/jobs/delete_expired_dialpeers_spec.rb b/spec/jobs/jobs/delete_expired_dialpeers_spec.rb
@@ -25,7 +25,7 @@
   end
 
   it 'should call DeleteDialpeers service' do
-    expect(DeleteDialpeers).to receive(:call).with(dialpeer_ids: expired_dialpeers.map(&:id)).and_call_original
+    expect(DeleteDialpeers).to receive(:call).with(dialpeer_ids: contain_exactly(*expired_dialpeers.map(&:id))).and_call_original
     subject
   end