Change the name of WORKSPACE directory

This patch changes the name of the directory within Jenkins workspace.
Changed it to 'packaging-ansible' from 'ansible', in order to make the
builds pass.

Change-Id: Ie502dc6686407d2c7968ef564ec9fbd5fc45fa8b
Signed-off-by: Taseer <taseer94@gmail.com>

diff --git a/jjb/packaging/setup-ansible-deb.sh b/jjb/packaging/setup-ansible-deb.sh
index 4a64b8763b926d541941444907b8f293b39d0f76..4501dbd6f495b740a14422c7c61ba9e137f02241 100644 (file)
--- a/jjb/packaging/setup-ansible-deb.sh
+++ b/jjb/packaging/setup-ansible-deb.sh
@@ -27,4 +27,4 @@ sudo apt-get install -y ansible
 # expects the dir containing the role to have the name of role. The JJB project
 # is called "ansible", which causes the cloned repo name to not match the role
 # name "opendaylight". So we need a cp/mv either way and this is simplest.
-sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
+sudo cp -R $WORKSPACE/packaging-ansible /etc/ansible/roles/opendaylight

diff --git a/jjb/packaging/setup-ansible-rpm.sh b/jjb/packaging/setup-ansible-rpm.sh
index eec7cbf037408381a46746d7faef81b3d53af24a..a70c89711c89458981035179079494174a65f439 100644 (file)
--- a/jjb/packaging/setup-ansible-rpm.sh
+++ b/jjb/packaging/setup-ansible-rpm.sh
@@ -20,4 +20,4 @@ sudo yum install -y ansible
 # expects the dir containing the role to have the name of role. The JJB project
 # is called "ansible", which causes the cloned repo name to not match the role
 # name "opendaylight". So we need a cp/mv either way and this is simplest.
-sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
+sudo cp -R $WORKSPACE/packaging-ansible /etc/ansible/roles/opendaylight

diff --git a/jjb/packaging/test-ansible-deb-custom-config.sh b/jjb/packaging/test-ansible-deb-custom-config.sh
index 0418c415b197dfe8dea11428bd83c696b14e1173..64b788e0dea5e7bc5e67f68032c345b8fc898b30 100644 (file)
--- a/jjb/packaging/test-ansible-deb-custom-config.sh
+++ b/jjb/packaging/test-ansible-deb-custom-config.sh
@@ -7,16 +7,16 @@ sudo apt-get remove opendaylight && sudo apt-get purge opendaylight
 sudo rm -rf /opt/opendaylight
 
 # Install OpenDaylight via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/deb_repo_api.yml --extra-vars "@$WORKSPACE/ansible/examples/log_vars.json"
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/examples/deb_repo_api.yml --extra-vars "@$WORKSPACE/packaging-ansible/examples/log_vars.json"
 
 # 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
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v

diff --git a/jjb/packaging/test-ansible-deb-default-config.sh b/jjb/packaging/test-ansible-deb-default-config.sh
index 031a30617caf264bb74e3af9b0b3f6f3d6c42a72..8fabbb7d667ec86e17522eba192f3622768bdcdf 100644 (file)
--- a/jjb/packaging/test-ansible-deb-default-config.sh
+++ b/jjb/packaging/test-ansible-deb-default-config.sh
@@ -7,16 +7,16 @@ sudo apt-get remove opendaylight && sudo apt-get purge opendaylight
 sudo rm -rf /opt/opendaylight
 
 # Install OpenDaylight via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/deb_repo_api.yml
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/examples/deb_repo_api.yml
 
 # 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
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v

diff --git a/jjb/packaging/test-ansible-odl-user.sh b/jjb/packaging/test-ansible-odl-user.sh
index 7535807fd7de9b70adeb4a68bcaa82c6828c6c7a..097b647181b2bef15c48582195a683f26d2f63e9 100644 (file)
--- a/jjb/packaging/test-ansible-odl-user.sh
+++ b/jjb/packaging/test-ansible-odl-user.sh
@@ -4,7 +4,7 @@
 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

diff --git a/jjb/packaging/test-ansible-rpm-custom-config.sh b/jjb/packaging/test-ansible-rpm-custom-config.sh
index b95c8ccec95194faa572a6e0e383691ceec4bdda..36f7c8e5f5bf50d70b8777aa0e8620c5d189a671 100644 (file)
--- a/jjb/packaging/test-ansible-rpm-custom-config.sh
+++ b/jjb/packaging/test-ansible-rpm-custom-config.sh
@@ -7,16 +7,16 @@ sudo yum remove opendaylight -y
 sudo rm -rf /opt/opendaylight
 
 # Install OpenDaylight with custom config via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/rpm_10_devel_odl_api.yml --extra-vars "@$WORKSPACE/ansible/examples/log_vars.json"
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/examples/rpm_10_devel_odl_api.yml --extra-vars "@$WORKSPACE/packaging-ansible/examples/log_vars.json"
 
 # 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
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v

diff --git a/jjb/packaging/test-ansible-rpm-default-config.sh b/jjb/packaging/test-ansible-rpm-default-config.sh
index 65f5b4be7a31b2094cf4921f4b343f4cf805bcc9..8d352a80b3d5e61cc65a306a04bfe28c45184f7f 100644 (file)
--- a/jjb/packaging/test-ansible-rpm-default-config.sh
+++ b/jjb/packaging/test-ansible-rpm-default-config.sh
@@ -7,16 +7,16 @@ sudo yum remove opendaylight -y
 sudo rm -rf /opt/opendaylight
 
 # Install OpenDaylight with custom config via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/rpm_10_devel_odl_api.yml
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/examples/rpm_10_devel_odl_api.yml
 
 # 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
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v

diff --git a/jjb/packaging/test-ansible-rpm-upgrade.sh b/jjb/packaging/test-ansible-rpm-upgrade.sh
index c5a5c5561ef812af479513db64f4d03f1b2188d9..f66e5d73ba1f062595677aea2f24bd58eb8f4fd3 100644 (file)
--- a/jjb/packaging/test-ansible-rpm-upgrade.sh
+++ b/jjb/packaging/test-ansible-rpm-upgrade.sh
@@ -9,4 +9,4 @@ sudo yum remove opendaylight -y
 sudo rm -rf /opt/opendaylight
 
 # Execute the upgrade tests
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-upgrade.yaml -v
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-upgrade.yaml -v

diff --git a/jjb/packaging/test-odl-logs.sh b/jjb/packaging/test-odl-logs.sh
index a8cca75c5f016ef88a391bd4b83874bdec1bbba7..af41a8611498072d613ca04c7716ee55186dc82e 100644 (file)
--- a/jjb/packaging/test-odl-logs.sh
+++ b/jjb/packaging/test-odl-logs.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Execute the test ODL logs playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-logs.yaml -v
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -v