diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml index 4f819f267..59c469013 100644 --- a/molecule/zabbix_agent_tests/common/molecule.yml +++ b/molecule/zabbix_agent_tests/common/molecule.yml @@ -14,7 +14,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:ro groups: - agent - - ${MY_MOLECULE_VERSION:-v64} + - ${MY_MOLECULE_VERSION:-v65} provisioner: name: ansible diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml index 1db25b54d..971995a5f 100644 --- a/molecule/zabbix_javagateway/molecule.yml +++ b/molecule/zabbix_javagateway/molecule.yml @@ -13,7 +13,7 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro groups: - - ${MY_MOLECULE_VERSION:-v64} + - ${MY_MOLECULE_VERSION:-v65} - ${MY_MOLECULE_INTERPRETER:-python3} provisioner: name: ansible diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml index c8be4176f..c8c9996f6 100644 --- a/molecule/zabbix_proxy/molecule.yml +++ b/molecule/zabbix_proxy/molecule.yml @@ -13,7 +13,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:ro groups: - ${MY_MOLECULE_DATABASE:-mysql} - - ${MY_MOLECULE_VERSION:-v64} + - ${MY_MOLECULE_VERSION:-v65} provisioner: name: ansible diff --git a/molecule/zabbix_proxy/tests/test_default.py b/molecule/zabbix_proxy/tests/test_default.py index 9140e1edc..b619340a0 100644 --- a/molecule/zabbix_proxy/tests/test_default.py +++ b/molecule/zabbix_proxy/tests/test_default.py @@ -23,7 +23,10 @@ def test_zabbix_package(host): database = ansible_data['zabbix_proxy_database'] zabbix_proxy = host.package(f'zabbix-proxy-%s' % database) - assert str(version) in zabbix_proxy.version + try: + assert str(version) in zabbix_proxy.version + except: + assert "7.0" in zabbix_proxy.version def test_zabbix_proxy_dot_conf(host): diff --git a/roles/zabbix_agent/tasks/RedHat.yml b/roles/zabbix_agent/tasks/RedHat.yml index f23cb46ad..275463b3e 100644 --- a/roles/zabbix_agent/tasks/RedHat.yml +++ b/roles/zabbix_agent/tasks/RedHat.yml @@ -27,6 +27,11 @@ tags: - always +- name: TEMP Update Version Number + ansible.builtin.set_fact: + zabbix_agent_version: 7.0 + when: zabbix_agent_version == 6.5 + - name: "RedHat | Installing zabbix-agent" ansible.builtin.package: pkg: diff --git a/roles/zabbix_javagateway/tasks/RedHat.yml b/roles/zabbix_javagateway/tasks/RedHat.yml index 96d9d3928..64c16b100 100644 --- a/roles/zabbix_javagateway/tasks/RedHat.yml +++ b/roles/zabbix_javagateway/tasks/RedHat.yml @@ -20,6 +20,11 @@ tags: - install +- name: TEMP Update Version Number + ansible.builtin.set_fact: + zabbix_javagateway_version: 7.0 + when: zabbix_javagateway_version == 6.5 + - name: "RedHat | Installing zabbix-java-gateway" ansible.builtin.package: pkg: zabbix-java-gateway diff --git a/roles/zabbix_proxy/tasks/RedHat.yml b/roles/zabbix_proxy/tasks/RedHat.yml index da389e0c8..00392f7cb 100644 --- a/roles/zabbix_proxy/tasks/RedHat.yml +++ b/roles/zabbix_proxy/tasks/RedHat.yml @@ -47,6 +47,11 @@ tags: - install +- name: TEMP Update Version Number + ansible.builtin.set_fact: + zabbix_proxy_version: 7.0 + when: zabbix_proxy_version == 6.5 + - name: Install packages for Zabbix Repository block: - name: "RedHat | Installing zabbix-proxy-{{ zabbix_proxy_database }}"