From 320f167beaa6e280bc2af3b88c188d14560a82d1 Mon Sep 17 00:00:00 2001
From: Romain Pelisse <belaran@gmail.com>
Date: Mon, 19 Dec 2022 08:56:25 +0100
Subject: [PATCH] molecule: centralize requirements

---
 molecule/default/molecule.yml           | 6 +++---
 molecule/overridexml/molecule.yml       | 6 +++---
 molecule/overridexml/requirements.yml   | 9 ---------
 molecule/quarkus/molecule.yml           | 4 ++--
 molecule/quarkus/requirements.yml       | 9 ---------
 molecule/{default => }/requirements.yml | 0
 6 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 molecule/overridexml/requirements.yml
 delete mode 100644 molecule/quarkus/requirements.yml
 rename molecule/{default => }/requirements.yml (100%)

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index ea8ad61..6f3b9c7 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -1,7 +1,7 @@
 ---
 dependency:
   name: shell
-  command: ansible-galaxy collection install -r molecule/default/requirements.yml -p $HOME/.ansible/collections --force-with-deps
+  command: ansible-galaxy collection install -r molecule/requirements.yml -p $HOME/.ansible/collections --force-with-deps
 driver:
   name: docker
 lint: |
@@ -16,7 +16,7 @@ platforms:
     port_bindings:
       - "8080/tcp"
       - "8443/tcp"
-      - "8009/tcp"      
+      - "8009/tcp"
 provisioner:
   name: ansible
   config_options:
@@ -33,7 +33,7 @@ provisioner:
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
-    ANSIBLE_FORCE_COLOR: "true"        
+    ANSIBLE_FORCE_COLOR: "true"
 verifier:
   name: ansible
 scenario:
diff --git a/molecule/overridexml/molecule.yml b/molecule/overridexml/molecule.yml
index ea8ad61..6f3b9c7 100644
--- a/molecule/overridexml/molecule.yml
+++ b/molecule/overridexml/molecule.yml
@@ -1,7 +1,7 @@
 ---
 dependency:
   name: shell
-  command: ansible-galaxy collection install -r molecule/default/requirements.yml -p $HOME/.ansible/collections --force-with-deps
+  command: ansible-galaxy collection install -r molecule/requirements.yml -p $HOME/.ansible/collections --force-with-deps
 driver:
   name: docker
 lint: |
@@ -16,7 +16,7 @@ platforms:
     port_bindings:
       - "8080/tcp"
       - "8443/tcp"
-      - "8009/tcp"      
+      - "8009/tcp"
 provisioner:
   name: ansible
   config_options:
@@ -33,7 +33,7 @@ provisioner:
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
-    ANSIBLE_FORCE_COLOR: "true"        
+    ANSIBLE_FORCE_COLOR: "true"
 verifier:
   name: ansible
 scenario:
diff --git a/molecule/overridexml/requirements.yml b/molecule/overridexml/requirements.yml
deleted file mode 100644
index 0aed172..0000000
--- a/molecule/overridexml/requirements.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-collections:
-  - name: middleware_automation.redhat_csp_download
-    version: ">=1.2.1"
-  - name: community.general
-  - name: ansible.posix
-  - name: community.docker
-    version: ">=1.9.1"
-    
diff --git a/molecule/quarkus/molecule.yml b/molecule/quarkus/molecule.yml
index 785de19..3895a53 100644
--- a/molecule/quarkus/molecule.yml
+++ b/molecule/quarkus/molecule.yml
@@ -1,7 +1,7 @@
 ---
 dependency:
   name: shell
-  command: ansible-galaxy collection install -r molecule/default/requirements.yml -p $HOME/.ansible/collections --force-with-deps
+  command: ansible-galaxy collection install -r molecule/requirements.yml -p $HOME/.ansible/collections --force-with-deps
 driver:
   name: docker
 lint: |
@@ -35,7 +35,7 @@ provisioner:
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
-    ANSIBLE_FORCE_COLOR: "true"        
+    ANSIBLE_FORCE_COLOR: "true"
 verifier:
   name: ansible
 scenario:
diff --git a/molecule/quarkus/requirements.yml b/molecule/quarkus/requirements.yml
deleted file mode 100644
index 0aed172..0000000
--- a/molecule/quarkus/requirements.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-collections:
-  - name: middleware_automation.redhat_csp_download
-    version: ">=1.2.1"
-  - name: community.general
-  - name: ansible.posix
-  - name: community.docker
-    version: ">=1.9.1"
-    
diff --git a/molecule/default/requirements.yml b/molecule/requirements.yml
similarity index 100%
rename from molecule/default/requirements.yml
rename to molecule/requirements.yml