Merge pull request #965 from konstruktoid/env

adapt to molecule changes

Author: konstruktoid

.gitignore

@@ -6,6 +6,7 @@
 *suid.list
 .ansible
 .cache
+.env.yml
 .scannerwork
 .sonar
 .tox

README.md

@@ -1001,7 +1001,7 @@ The [argument_specs.yml](meta/argument_specs.yml) file is used to generate the
 documentation and defaults for this role, so please ensure that any changes
 made to the role are also reflected in the `argument_specs.yml` file.
 
-After making changes, run `bash genREADME.sh` to regenerate the defaults file,
+After making changes, run `bash generate_doc_defaults.sh` to regenerate the defaults file,
 README and other documentation files.
 
 Last but not least, ensure that the role passes all tests by running

STRUCTURE.md

@@ -21,8 +21,9 @@
 │       └── share
 │           └── dict
 │               └── passwords.list
-├── genDefault.py
-├── genREADME.sh
+├── generate_defaults.py
+├── generate_doc_defaults.sh
+├── generate_molecule_env.sh
 ├── handlers
 │   └── main.yml
 ├── meta
@@ -49,6 +50,7 @@
 ├── postChecks.sh
 ├── renovate.json
 ├── requirements-dev.txt
+├── requirements-upstream.txt
 ├── requirements.yml
 ├── runTests.sh
 ├── tasks
@@ -165,5 +167,5 @@
 │   └── test.yml
 └── tox.ini
 
-40 directories, 122 files
+40 directories, 124 files
 ```

genDefault.py renamed to generate_defaults.py

@@ -188,7 +188,7 @@ The [argument_specs.yml](meta/argument_specs.yml) file is used to generate the
 documentation and defaults for this role, so please ensure that any changes
 made to the role are also reflected in the \`argument_specs.yml\` file.
 
-After making changes, run \`bash genREADME.sh\` to regenerate the defaults file,
+After making changes, run \`bash generate_doc_defaults.sh\` to regenerate the defaults file,
 README and other documentation files.
 
 Last but not least, ensure that the role passes all tests by running
@@ -251,7 +251,7 @@ echo '```'
 
 aar-doc --output-template aar-doc_template.j2 "$(pwd)" markdown
 
-python3 genDefault.py meta/argument_specs.yml > defaults/main.yml || exit 1
+python3 generate_defaults.py meta/argument_specs.yml > defaults/main.yml || exit 1
 
 ansible-lint --fix . &>/dev/null
 ansible-lint --fix .

genREADME.sh renamed to generate_doc_defaults.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -euo pipefail
+
+PYTHON_LIB_PATH="$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')"
+
+echo "ANSIBLE_FILTER_PLUGINS: ${PYTHON_LIB_PATH}/molecule/provisioner/ansible/plugins/filter:${HOME}/.ansible/plugins/filter:/usr/share/ansible/plugins/filter
+ANSIBLE_LIBRARY: ${PYTHON_LIB_PATH}/molecule/provisioner/ansible/plugins/modules:${PYTHON_LIB_PATH}/molecule_plugins/vagrant/modules:${HOME}/.ansible/plugins/modules:/usr/share/ansible/plugins/modules"

generate_molecule_env.sh

@@ -2,8 +2,8 @@ aar-doc
 ansible
 ansible-lint
 jmespath
+molecule
 molecule-plugins[docker]
 molecule-plugins[vagrant]
-molecule==25.1.0
 passlib
 tox

requirements-dev.txt

@@ -1,9 +1,9 @@
 aar-doc
 git+https://github.com/ansible-community/ansible-lint.git
-https://github.com/ansible/ansible/archive/devel.tar.gz
+git+https://github.com/ansible/ansible.git
+git+https://github.com/ansible/molecule.git
 jmespath
 molecule-plugins[docker]@git+https://github.com/ansible-community/molecule-plugins.git
 molecule-plugins[vagrant]@git+https://github.com/ansible-community/molecule-plugins.git
-molecule==25.1.0
 passlib
 tox

requirements-upstream.txt

@@ -13,45 +13,43 @@ skipsdist = true
 description = Run tests using molecule
 basepython = python3.12
 set_env =
-    ANSIBLE_REMOTE_TMP="/var/tmp/${USER}/ansible"
-passenv = *
+    PYTHON_LIB_PATH={envdir}/lib/{basepython}/site-packages
+    ANSIBLE_REMOTE_TMP=/var/tmp/${USER}/ansible
+    ANSIBLE_FILTER_PLUGINS={env:PYTHON_LIB_PATH}/molecule/provisioner/ansible/plugins/filter:${HOME}/.ansible/plugins/filter:/usr/share/ansible/plugins/filter
+    ANSIBLE_LIBRARY={env:PYTHON_LIB_PATH}/molecule/provisioner/ansible/plugins/modules:${PYTHON_LIB_PATH}/molecule_plugins/vagrant/modules:${HOME}/.ansible/plugins/modules:/usr/share/ansible/plugins/modules
 deps =
     -r requirements-dev.txt
 commands =
     ansible --version
     ansible-lint --version
+    molecule --version
     ansible-galaxy install --force -r requirements.yml
     ansible-lint
     molecule test
 
 [testenv:upstream]
 description = Run tests using molecule against upstream Ansible and ansible-lint
 deps =
-    -r requirements-dev.txt
-    git+https://github.com/ansible-community/ansible-lint.git
-    https://github.com/ansible/ansible/archive/devel.tar.gz
+    -r requirements-upstream.txt
 
 [testenv:docker]
 description = Run tests using molecule with Docker driver
 commands =
     ansible --version
     ansible-lint --version
+    molecule --version
     ansible-galaxy install --force -r requirements.yml
     ansible-lint
     molecule test -s docker
 
 [testenv:docker-upstream]
 description = Run tests using molecule with Docker driver against upstream Ansible and ansible-lint
-set_env =
-    ANSIBLE_ALLOW_BROKEN_CONDITIONALS=True
 deps =
-    -r requirements-dev.txt
-    git+https://github.com/ansible-community/ansible-lint.git
-    https://github.com/ansible/ansible/archive/devel.tar.gz
-    molecule-plugins[docker]@git+https://github.com/ansible-community/molecule-plugins.git
+    -r requirements-upstream.txt
 commands =
     ansible --version
     ansible-lint --version
+    molecule --version
     ansible-galaxy install --force -r requirements.yml
     ansible-lint
     molecule test -s docker