Add Molecule testing for Singularity, plus infra for more roles #1088
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ajdecon
force-pushed
the
singularity-centos-8
branch
2 times, most recently
from
676d129
to
75d2fbf
Compare
dholt
reviewed
Jan 7, 2022
ajdecon
added
the
nice-to-have-for-release
ajdecon
force-pushed
the
singularity-centos-8
branch
2 times, most recently
from
cdaac35
to
bcdb847
Compare
Summary ------- - Fixes the ability to install Singularity on EL8 by enabling the necessary repos - Move the pre-execution logic for the Singularity Galaxy role into a new DeepOps role, singularity_wrapper - Modify the playbook to use singularity_wrapper - Add Molecule tests to singularity_wrapper role - Add a Github Action configuration to execute this and other Molecule tests of DeepOps roles - Add documentation to `docs/deepops/testing.md` to describe these tests and provide instructions on adding more Test plan --------- Clean execution of the Github action for this role Future work ----------- This change adds a lot of infrastructure that should make it easier to add testing to additional roles. Future changes should enable testing of more of the roles in DeepOps, but I didn't want to get *too* carried away in this one. 馃槈
Annoyingly, includes in requirements.yml seem to be relative to the cwd of ansible-galaxy, rather than relative to the requirements file. ansible/ansible#46385 Made changes to setup.sh in order to ensure we can install requirements even if we use includes.
Just check that we actually install Singularity
ajdecon
force-pushed
the
singularity-centos-8
branch
from
fe750de
to
123ae29
Compare
|
@dholt : This should be ready to test now! I simplified the requirements file handling for Github actions. |
dholt
reviewed
Jan 18, 2022
scripts/setup.sh
Outdated
Comment on lines
149
to
167
| as_user ansible-galaxy collection install --force -r "${ROOT_DIR}/roles/requirements.yml" >/dev/null | ||
| as_user ansible-galaxy role install --force -r "${ROOT_DIR}/roles/requirements.yml" >/dev/null | ||
| as_user ansible-galaxy collection install --force -i -r "${ROOT_DIR}/config/requirements.yml" >/dev/null | ||
| as_user ansible-galaxy role install --force -i -r "${ROOT_DIR}/config/requirements.yml" >/dev/null | ||
| initial_dir="$(pwd)" | ||
| roles_path="${ROOT_DIR}/roles/galaxy" | ||
| collections_path="${ROOT_DIR}/collections" | ||
|
|
||
| # First, install requirements from role requirements. | ||
| # Note: due to a known issue in ansible-galaxy, this works best when the | ||
| # cwd is the same as the directory where the file is located. | ||
| # https://github.com/ansible/ansible/issues/46385 | ||
| cd "${ROOT_DIR}/roles" | ||
| as_user ansible-galaxy collection install -p "${collections_path}" --force -r "requirements.yml" >/dev/null | ||
| as_user ansible-galaxy role install -p "${roles_path}" --force -r "requirements.yml" >/dev/null | ||
|
|
||
| # Install any user-defined config requirements | ||
| if [ -d "${CONFIG_DIR}" ]; then | ||
| cd "${CONFIG_DIR}" | ||
| as_user ansible-galaxy collection install -p "${collections_path}" --force -i -r "requirements.yml" >/dev/null | ||
| as_user ansible-galaxy role install -p "${roles_path}" --force -i -r "requirements.yml" >/dev/null | ||
| fi | ||
| cd "${initial_dir}" |
There was a problem hiding this comment.
I'm still getting this warning and these errors when running the setup script:
Not entirely sure about this one since it seems properly set in the ansible.cfg file. Is the setup script no longer using the virtual env?
[WARNING]: The specified collections path '/home/ubuntu/deepops/collections' is not part of the configured Ansible collections paths '/home/ubuntu/.ansible/collections:/usr/share/ansible/collections'. The installed collection won't be picked up in an Ansible run.
Wondering if this is because the collections and roles vars in the config/requirements.yml file are empty?
ERROR! Unexpected Exception, this is probably a bug: 'NoneType' object is not iterable
ERROR! Unexpected Exception, this is probably a bug: 'NoneType' object is not iterable
dholt
approved these changes
Jan 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
necessary repos
new DeepOps role, singularity_wrapper
singularity_wrapper role, and include this from
roles/requirements.ymltests of DeepOps roles
docs/deepops/testing.mdto describe these testsand provide instructions on adding more
Test plan
Future work
This change adds a lot of infrastructure that should make it easier to
add testing to additional roles. Future changes should enable testing of
more of the roles in DeepOps, but I didn't want to get too carried
away in this one. 馃槈