Updated Default Molecule Image and Versions (#1068)

ansible-collections · Aug 19, 2023 · 2c9e34b · 2c9e34b
1 parent e9cc864
commit 2c9e34b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml
@@ -4,7 +4,7 @@ driver:
 
 platforms:
   - name: zabbix-agent-${MY_MOLECULE_CONTAINER:-centos}
-    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-"centos8"}-ansible:latest
+    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     privileged: true
     pre_build_image: true
@@ -14,7 +14,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - agent
-      - ${MY_MOLECULE_VERSION:-6.2}
+      - ${MY_MOLECULE_VERSION:-v64}
 
 provisioner:
   name: ansible

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -4,7 +4,7 @@ driver:
 
 platforms:
   - name: zabbix-server-${MY_MOLECULE_CONTAINER:-centos}
-    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-"centos8"}-ansible:latest
+    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     privileged: true
     pre_build_image: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -13,7 +13,7 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
-      - ${MY_MOLECULE_VERSION:-62}
+      - ${MY_MOLECULE_VERSION:-v64}
       - ${MY_MOLECULE_INTERPRETER:-python3}
 provisioner:
   name: ansible

diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: docker
 platforms:
   - name: zabbix-proxy-${MY_MOLECULE_CONTAINER:-centos}
-    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-"centos8"}-ansible:latest
+    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     privileged: true
     pre_build_image: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -13,7 +13,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v62}
+      - ${MY_MOLECULE_VERSION:-v64}
 
 provisioner:
   name: ansible

diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: docker
 platforms:
   - name: zabbix-server-${MY_MOLECULE_CONTAINER:-centos}
-    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-"centos8"}-ansible:latest
+    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     privileged: true
     pre_build_image: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -13,7 +13,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-6.2}
+      - ${MY_MOLECULE_VERSION:-v64}
       - ${MY_MOLECULE_INTERPRETER:-python3}
 
 provisioner:

diff --git a/molecule/zabbix_web/molecule.yml b/molecule/zabbix_web/molecule.yml
@@ -11,7 +11,7 @@ driver:
   name: docker
 platforms:
   - name: zabbix-web-${MY_MOLECULE_CONTAINER:-centos}
-    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-"rockylinux8"}-ansible:latest
+    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     privileged: true
     pre_build_image: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -21,7 +21,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v62}
+      - ${MY_MOLECULE_VERSION:-v64}
       - ${MY_MOLECULE_INTERPRETER:-python3}
       - ${MY_MOLECULE_WEB_SERVER:-apache}