[skip travis] normalize molecule.yml files

Signed-off-by: Charlie Mordant <[email protected]>
OsgiliathEnterprise · Jun 3, 2023 · bab0fd0 · bab0fd0
1 parent 74646ef
commit bab0fd0
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 19 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,8 +1,6 @@
 ---
 # defaults file for lvm
 
-idm_client_group: 'ipaclients'
-idm_group: 'ipaservers' # do not change: convention from the ipa roles
 datastore_firewall_zone: 'public'
 keytab_path: '/etc/krb5.keytab'
 standalone_role: True

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -13,7 +13,7 @@ driver:
     name: virtualbox
 platforms:
   - name: consumer.osgiliath.test
-    box: fedora/38-cloud-base
+    box: ${TESTBOX:-fedora/38-cloud-base}
     provider_options:
       cpus: 2
       memory: 3096
@@ -22,13 +22,13 @@ platforms:
         # ip: "192.168.56.5"
         auto_config: true
         network_name: private_network
-        # virtualbox__intnet: "internalnetwork"
+        virtualbox__intnet: "internalnetwork"
     groups:
       - ipaservers
     provider_raw_config_args:
       - "customize ['storagectl', :id, '--name', 'IDE', '--hostiocache', 'on']"
   - name: datastore.osgiliath.test
-    box: fedora/38-cloud-base
+    box: ${TESTBOX:-fedora/38-cloud-base}
     provider_options:
       cpus: 2
       memory: 2048
@@ -37,7 +37,7 @@ platforms:
         # ip: "192.168.56.5"
         auto_config: true
         network_name: private_network
-        # virtualbox__intnet: "internalnetwork"
+        virtualbox__intnet: "internalnetwork"
     groups:
       - ipaclients
     provider_raw_config_args:

diff --git a/molecule/kvm/molecule.yml b/molecule/kvm/molecule.yml
@@ -13,7 +13,7 @@ driver:
     name: libvirt
 platforms:
   - name: consumer.osgiliath.test
-    box: fedora/38-cloud-base
+    box: ${TESTBOX:-fedora/38-cloud-base}
     provider_options:
       driver: "kvm"
       cpus: 2
@@ -25,7 +25,7 @@ platforms:
     groups:
       - ipaservers
   - name: datastore.osgiliath.test
-    box: fedora/38-cloud-base
+    box: ${TESTBOX:-fedora/38-cloud-base}
     provider_options:
       driver: "kvm"
       cpus: 2

diff --git a/molecule/parallels/molecule.yml b/molecule/parallels/molecule.yml
@@ -13,7 +13,7 @@ driver:
     name: parallels
 platforms:
   - name: consumer.osgiliath.test
-    box: tcharl/fedora-36-aarch64
+    box: ${TESTBOX:-bento/fedora-38-arm64}
     provider_options:
       cpus: 2
       memory: 2048
@@ -26,7 +26,7 @@ platforms:
     groups:
       - ipaservers
   - name: datastore.osgiliath.test
-    box: tcharl/fedora-36-aarch64
+    box: ${TESTBOX:-bento/fedora-38-arm64}
     provider_options:
       cpus: 2
       memory: 2048

diff --git a/molecule/parallels/prepare.yml b/molecule/parallels/prepare.yml
@@ -6,19 +6,19 @@
         name: tcharl.nfs_client
         tasks_from: requirements.yml
       vars:
-        secure_logs: false
+        secure_logs: False
         preferred_nic: "eth1"
         company_domain: osgiliath.test
         company_realm_password: '123ADMin'
         company_ad_password: '123ADmPass'
 - name: Expose NFS
   hosts: datastore.osgiliath.test
   vars:
-    secure_logs: false
+    secure_logs: False
+    preferred_nic: "eth1"
     company_domain: osgiliath.test
     company_realm_password: '123ADMin'
     company_ad_password: '123ADmPass'
-    preferred_nic: "eth1"
     lvm_groups:
       - vgname: non-persistent
         disks:

diff --git a/tasks/requirements.yml b/tasks/requirements.yml
@@ -3,3 +3,5 @@
 - name: Requirements | install freeipa and declare dns
   ansible.builtin.import_role:
     name: tcharl.ansible_nameserver
+  tags:
+    - dependency
diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ env_list =
     dependency
     lint
     create
+    create-monorepo
     converge
     converge-monorepo
     test-exec
@@ -48,12 +49,6 @@ commands =
     yamllint .
     flake8
     ansible-lint
-[testenv:create]
-setenv =
-    DEPENDENCY_ENABLED=False
-deps =
-    -r requirements-dev.txt
-commands = molecule create {posargs}
 [common-ansible-path]
 setenv =
     ANSIBLE_ROLES_PATH={toxinidir}/../community:{toxinidir}/../oss:{toxinidir}/..
@@ -62,6 +57,25 @@ commands =
     mkdir -p {toxinidir}/../community
     mkdir -p {toxinidir}/../oss
     mkdir -p {toxinidir}/../community-collections
+[testenv:create]
+allowlist_externals=mkdir
+setenv =
+    {[common-ansible-path]setenv}
+deps =
+    -r requirements-dev.txt
+commands =
+    {[common-ansible-path]commands}
+    molecule create {posargs}
+[testenv:create-monorepo]
+allowlist_externals=mkdir
+setenv =
+    {[common-ansible-path]setenv}
+    REQUIREMENTS_PATH={toxinidir}/requirements-monorepo.yml
+deps =
+    -r requirements-dev.txt
+commands =
+    {[common-ansible-path]commands}
+    molecule create {posargs}
 [testenv:converge-monorepo]
 allowlist_externals=mkdir
 setenv =

diff --git a/vars/main.yml b/vars/main.yml
@@ -0,0 +1,4 @@
+---
+
+idm_client_group: 'ipaclients'
+idm_group: 'ipaservers' # do not change: convention from the ipa roles