From e7c718b66a8edb8724e4cf46268b47b1767ac28d Mon Sep 17 00:00:00 2001
From: Daniel Matthews <d.matthews@ucl.ac.uk>
Date: Wed, 20 Dec 2023 10:27:44 +0000
Subject: [PATCH] Rename the roles scenario

---
 .../{roles => centos7_roles}/molecule.yml     | 36 +++++--------------
 1 file changed, 8 insertions(+), 28 deletions(-)
 rename tests/molecule/{roles => centos7_roles}/molecule.yml (55%)

diff --git a/tests/molecule/roles/molecule.yml b/tests/molecule/centos7_roles/molecule.yml
similarity index 55%
rename from tests/molecule/roles/molecule.yml
rename to tests/molecule/centos7_roles/molecule.yml
index 7ff1bb1c..1d17a4f8 100644
--- a/tests/molecule/roles/molecule.yml
+++ b/tests/molecule/centos7_roles/molecule.yml
@@ -10,8 +10,8 @@ driver:
   name: docker
 
 platforms:
-  - name: centos7
-    hostname: molecule.centos7.local
+  - name: instance
+    hostname: molecule.instance.local
     image: ${MOLECULE_DOCKER_IMAGE:-geerlingguy/docker-centos7-ansible:latest}
     required: true
     command: ""
@@ -19,7 +19,7 @@ platforms:
     privileged: true
     pre_build_image: ${MOLECULE_PRE_BUILD_IMAGE:-true}
     volumes:
-      - ${MOLECULE_SCENARIO_DIRECTORY}/molecule-data:/storage/molecule
+      - ./molecule-data:/storage/molecule
     keep_volumes: false
     groups:
       - all
@@ -34,26 +34,6 @@ platforms:
       - name: molecule
         ipv4_address: 192.168.56.2
 
-  - name: rocky9
-    hostname: molecule.rocky9.local
-    image: ${MOLECULE_DOCKER_IMAGE:-geerlingguy/docker-rockylinux9-ansible:latest}
-    required: true
-    command: ""
-    cgroupns_mode: host
-    privileged: true
-    pre_build_image: ${MOLECULE_PRE_BUILD_IMAGE:-true}
-    volumes:
-      - ${MOLECULE_SCENARIO_DIRECTORY}/molecule-data:/storage/molecule
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    keep_volumes: false
-    groups:
-      - all
-      - molecule
-      - rocky9
-    networks:
-      - name: molecule
-        ipv4_address: 192.168.56.3
-
 provisioner:
   name: ansible
   log: true
@@ -64,12 +44,12 @@ provisioner:
       run: ${MOLECULE_RUN_TAGS:-all}
   inventory:
     links:
-      hosts: ../resources/roles/inventory/hosts.yml
-      group_vars: ../resources/roles/inventory/group_vars/
+      hosts: ../resources/inventory/hosts.yml
+      group_vars: ../resources/inventory/group_vars/
   playbooks:
-    converge: ../resources/roles/converge.yml
-    prepare: ../resources/shared/prepare.yml
-    verify: ../resources/roles/verify.yml
+    converge: ../resources/converge.yml
+    prepare: ../resources/prepare.yml
+    verify: ../resources/verify.yml
   env:
     ANSIBLE_VERBOSITY: "1"