summaryrefslogtreecommitdiffstats
path: root/xci/xci-deploy.sh
diff options
context:
space:
mode:
Diffstat (limited to 'xci/xci-deploy.sh')
-rwxr-xr-xxci/xci-deploy.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index fb678ec5..80b10106 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -85,6 +85,9 @@ unset user_local_dev_vars local_user_var
# register our handler
trap submit_bug_report ERR
+# We are using sudo so we need to make sure that env_reset is not present
+sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers
+
#-------------------------------------------------------------------------------
# Log info to console
#-------------------------------------------------------------------------------
@@ -103,6 +106,14 @@ echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
echo "-------------------------------------------------------------------------"
#-------------------------------------------------------------------------------
+# Clean up environment
+#-------------------------------------------------------------------------------
+echo "Info: Cleaning up previous XCI artifacts"
+echo "-------------------------------------------------------------------------"
+sudo -E bash files/xci-destroy-env.sh
+echo "-------------------------------------------------------------------------"
+
+#-------------------------------------------------------------------------------
# Install ansible on localhost
#-------------------------------------------------------------------------------
echo "Info: Installing Ansible from pip"