Remove duplicated parts from Ansible-ODL CI script

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

diff --git a/jjb/packaging/test-ansible-rpm.sh b/jjb/packaging/test-ansible-rpm.sh
index b1588a1cd56b3b5ff63d52171581747956667701..df2feb3185dbeb31c0ecdab778dce58147a6289c 100644 (file)
--- a/jjb/packaging/test-ansible-rpm.sh
+++ b/jjb/packaging/test-ansible-rpm.sh
@@ -1,28 +1,4 @@
 #!/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
-
-# Install required packages
-virtualenv rpm_build
-source rpm_build/bin/activate
-PYTHON="rpm_build/bin/python"
-$PYTHON -m pip install --upgrade pip
-
-# Install Ansible
-sudo yum install -y ansible
-
-# Install local version of ansible-opendaylight to path expected by Ansible.
-# Could almost do this by setting ANSIBLE_ROLES_PATH=$WORKSPACE, but 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
-
 # Install OpenDaylight via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/odl_6_testing_playbook.yml
-
-# Add more tests
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/rpm_8_devel_odl_api.yml --extra-vars "@$WORKSPACE/ansible/examples/log_vars.json"