Merge "Move dlux Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / packaging / test-ansible-odl-user.sh

diff --git a/jjb/packaging/test-ansible-odl-user.sh b/jjb/packaging/test-ansible-odl-user.sh
index c44c08bb7249e483b6b8a1047e0022dac049fbe6..130cf350ba97c53e72e3f50a6400545e766917be 100644 (file)
--- a/jjb/packaging/test-ansible-odl-user.sh
+++ b/jjb/packaging/test-ansible-odl-user.sh
@@ -1,16 +1,10 @@
 #!/bin/bash
 
-# Options:
-#   -x: Echo commands
-#   -e: Fail on errors
-#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
-set -ex -o pipefail
-
 # Create Ansible custom module directories
 sudo mkdir -p /usr/share/ansible/plugins/modules
 
 # Copy the custom module to the directory above
-sudo cp $WORKSPACE/ansible/library/odl_usermod.py /usr/share/ansible/plugins/modules/
+sudo cp "$WORKSPACE"/packaging-ansible/library/odl_usermod.py /usr/share/ansible/plugins/modules/
 
 # Execute the odl-user-test playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-users.yaml -v
+sudo ansible-playbook -i "localhost," -c local "$WORKSPACE"/packaging-ansible/tests/test-odl-users.yaml -v