Skip to content

Commit

Permalink
Simplify CD
Browse files Browse the repository at this point in the history
Signed-off-by: Pablo Iranzo Gómez <Pablo.Iranzo@gmail.com>
  • Loading branch information
iranzo committed Oct 23, 2019
1 parent 0d5a839 commit 0826170
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions tests/shell/lab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ if [[ $? -ne 0 ]]; then
fi

# Ansible playbooks are in the prior folder, launch from there
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}
cd ..
cd $(dirname "${BASH_SOURCE[0]}")/..

set -o pipefail
ansible-playbook --private-key ${SSH_KEY_LOCATION} ansible/${targetEnvironment}-provision.yml | tee ansible-${targetEnvironment}-${labName}-provision.log
Expand Down
4 changes: 1 addition & 3 deletions tests/shell/provision-and-destroy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ if [[ $? -ne 0 ]]; then
fi

# Ansible playbooks are in the prior folder, launch from there
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}
cd ..
cd $(dirname "${BASH_SOURCE[0]}")/..

ansible-playbook ansible/${targetEnvironment}-provision.yml && ansible-playbook ansible/${targetEnvironment}-cleanup.yml

0 comments on commit 0826170

Please sign in to comment.