Fixed integration tests

Author: fabiang

.github/workflows/ci.yml

@@ -40,16 +40,22 @@ jobs:
         zabbix:
           - version: "4.0"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "5.0"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "6.0"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "6.2"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "6.4"
             suffix: "-latest"
-          - version: "trunk" # will become 7.0
-            suffix: ""
+            postgress_version: "16-alpine"
+          - version: "7.0"
+            suffix: "-latest"
+            postgress_version: "16-alpine"
 
     name: "Zabbix ${{ matrix.zabbix.version }} Integration Tests"
 
@@ -67,16 +73,22 @@ jobs:
       env:
         ZBX_VERSION: "${{ matrix.zabbix.version }}"
         ZBX_VERSION_SUFFIX: "${{ matrix.zabbix.suffix }}"
+        POSTGRES_VERSION: "${{ matrix.zabbix.postgress_version }}"
 
     - name: Wait for Zabbix server to become available
-      uses: iFaxity/[email protected]
+      id: wait_for_server
+      uses: iFaxity/[email protected]
       with:
         resource: tcp:localhost:10051
-        timeout: 900000
+        timeout: 300000
         interval: 10000
         delay: 60000
         log: true
 
+    - name: Server logs
+      if: always() && steps.wait_for_server.outcome == 'failure'
+      run: docker compose -f "docker-compose.yml" logs server
+
     - name: Test
       run: go test -v "./test/integration/..."
 

docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - POSTGRES_DB=zabbix
 
   database:
-    image: postgres
+    image: postgres:${POSTGRES_VERSION:-alpine}
     environment:
       - POSTGRES_USER=zabbix
       - POSTGRES_PASSWORD=zabbix