From 56c4f89cb33c241c05c1c8b922c8d04d75f43ea2 Mon Sep 17 00:00:00 2001
From: "Troy W." <pyrodie18@gmail.com>
Date: Thu, 6 Jun 2024 00:00:28 -0400
Subject: [PATCH] Javagate 7.0 Update

---
 .github/workflows/javagateway.yml        | 1 +
 molecule/zabbix_javagateway/molecule.yml | 2 ++
 roles/zabbix_javagateway/vars/Debian.yml | 5 +++++
 roles/zabbix_javagateway/vars/RedHat.yml | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
index f3c261703..969983e43 100644
--- a/.github/workflows/javagateway.yml
+++ b/.github/workflows/javagateway.yml
@@ -28,6 +28,7 @@ jobs:
           - debian12
           - debian11
         version:
+          - v70
           - v64
           - v62
           - v60
diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
index c0481cb00..8803e8959 100644
--- a/molecule/zabbix_javagateway/molecule.yml
+++ b/molecule/zabbix_javagateway/molecule.yml
@@ -24,6 +24,8 @@ provisioner:
       all:
         zabbix_repo_apt_priority: 1
         zabbix_repo_yum_gpg_check: 1
+      v70:
+        zabbix_javagateway_version: 7.0
       v64:
         zabbix_javagateway_version: 6.4
       v62:
diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
index dbb48d793..3181d1d4f 100644
--- a/roles/zabbix_javagateway/vars/Debian.yml
+++ b/roles/zabbix_javagateway/vars/Debian.yml
@@ -1,22 +1,27 @@
 zabbix_valid_javagateway_versions:
   # Debian
   "12":
+    - 7.0
     - 6.4
     - 6.0
   "11":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0
 
   # Ubuntu
   "24":
+    - 7.0
     - 6.4
     - 6.0
   "22":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0
   "20":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0
diff --git a/roles/zabbix_javagateway/vars/RedHat.yml b/roles/zabbix_javagateway/vars/RedHat.yml
index 62af028ff..72f593374 100644
--- a/roles/zabbix_javagateway/vars/RedHat.yml
+++ b/roles/zabbix_javagateway/vars/RedHat.yml
@@ -1,10 +1,12 @@
 ---
 zabbix_valid_javagateway_versions:
   "9":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0
   "8":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0