From 6fdbb90f354b44eabe68c1f3cf91370200534d9c Mon Sep 17 00:00:00 2001
From: Troy W <pyrodie18@gmail.com>
Date: Fri, 28 Jul 2023 23:59:43 -0400
Subject: [PATCH] Update python and docker compose for integration tests
 (#1054)

---
 .github/workflows/agent.yml               |  4 ++--
 .github/workflows/javagateway.yml         |  4 ++--
 .github/workflows/plugins-integration.yml | 14 ++++++--------
 .github/workflows/proxy.yml               |  4 ++--
 .github/workflows/repo-sanity.yml         |  8 ++++----
 .github/workflows/server.yml              |  4 ++--
 .github/workflows/web.yml                 |  4 ++--
 7 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
index cbd6dfa19..572cc5c64 100644
--- a/.github/workflows/agent.yml
+++ b/.github/workflows/agent.yml
@@ -43,10 +43,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
index c80c3781f..37538478a 100644
--- a/.github/workflows/javagateway.yml
+++ b/.github/workflows/javagateway.yml
@@ -44,10 +44,10 @@ jobs:
           - zabbix_javagateway
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
diff --git a/.github/workflows/plugins-integration.yml b/.github/workflows/plugins-integration.yml
index 317a7b40a..7f9079771 100644
--- a/.github/workflows/plugins-integration.yml
+++ b/.github/workflows/plugins-integration.yml
@@ -31,25 +31,22 @@ jobs:
           - stable-2.15
           - devel
         python:
-          - 3.9
+          - '3.10'
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ansible_collections/community/zabbix
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
 
-      - name: Install dependencies
-        run: pip install docker-compose
-
       - name: Install ansible.netcommon collection
         run: ansible-galaxy collection install ansible.netcommon -p $GITHUB_WORKSPACE
         working-directory: ./ansible_collections/community/zabbix
@@ -58,8 +55,9 @@ jobs:
       # the Zabbix server. To do this we spin up a Docker container using the `matrix`
       # of version and ports specified earlier.
       - name: Zabbix container server provisioning
-        run: docker-compose up -d
-        working-directory: ./ansible_collections/community/zabbix
+        uses: isbang/compose-action@v1.5.0
+        with:
+          compose-file: "./ansible_collections/community/zabbix/docker-compose.yml"
         env:
           zabbix_version: ${{ matrix.zabbix_container.version }}
 
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
index e3c154693..c6d7bd5e6 100644
--- a/.github/workflows/proxy.yml
+++ b/.github/workflows/proxy.yml
@@ -48,10 +48,10 @@ jobs:
             version: v62
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
diff --git a/.github/workflows/repo-sanity.yml b/.github/workflows/repo-sanity.yml
index bafa0fe98..f4c780173 100644
--- a/.github/workflows/repo-sanity.yml
+++ b/.github/workflows/repo-sanity.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         python:
-          - 3.9
+          - '3.10'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
@@ -45,19 +45,19 @@ jobs:
           - stable-2.15
           - devel
         python:
-          - 3.9
+          - '3.10'
     runs-on: ubuntu-latest
     steps:
       # ansible-test requires the collection to be in a directory in the form
       # .../ansible_collections/NAMESPACE/COLLECTION_NAME/
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ansible_collections/community/zabbix
 
       - name: Set up Python ${{ matrix.ansible }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 8dc0b700b..775d40efb 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -52,10 +52,10 @@ jobs:
             version: v64
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 73705ef97..47a1b1d11 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -54,10 +54,10 @@ jobs:
             version: v62
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9