DCD-386: Cleanups and clarifications.

This commit is contained in:
Steve Smith
2019-06-13 15:30:56 +10:00
parent 8925cd5af9
commit e1dab14a7f
3 changed files with 11 additions and 7 deletions

View File

@@ -14,4 +14,5 @@ source $ENV_FILE
set +a
# Use Ansible from virtualenv if provided
pipenv run ansible-playbook -v -i $INV $PLAYBOOK 2>&1 | tee --append $LOG_FILE
pipenv run \
ansible-playbook -v -i $INV $PLAYBOOK 2>&1 | tee --append $LOG_FILE

View File

@@ -4,12 +4,14 @@ set -e
# The Amazon Linux 2 Ansible package is 2.4, which has issue
# interacting with RDS, so use pipenv to install a known-good version.
# Another alternative here would be nix, however that has issues
# installing as root, and can be slow in practice.
# Luckily AmzLnx2 and Ubuntu use the same package name. This may need
# some logic if other distros are added. Note: Parsing /etc/os-release
# is probably a good starting point for that.
# Luckily AmazonLinux2 and Ubuntu use the same package name for
# pip. This may need some logic if other distros are added. Note:
# Parsing /etc/os-release is probably a good starting point for that.
./bin/pacapt install python-pip
# See Pipfile and Pipfile.lock.
pip install pipenv
pipenv sync

View File

@@ -2,11 +2,12 @@
set -e
# Use Ansible from virtualenv if provided
# Install dev packages from Pipfile.loc if necessary.
pipenv sync --dev
for role in `find roles/ -name molecule | sort`; do
pushd `dirname $role`
pipenv run molecule test --all
pipenv run \
molecule test --all
popd
done