Merge "[AMQP 1.0] Setup the amqp1 test environment on ubuntu"

bindep.txt

@@ -24,6 +24,7 @@ qpidd [platform:dpkg amqp1]
 sasl2-bin [platform:dpkg amqp1]
 uuid-dev [platform:dpkg amqp1]
 swig [platform:dpkg amqp1]
+libsasl2-modules [platform:dpkg amqp1]
 
 # AMQP1 rpm
 qpid-cpp-server [platform:rpm amqp1]

oslo_messaging/tests/functional/gate/post_test_hook.sh

@@ -47,9 +47,6 @@ case $RPC_BACKEND in
         sudo apt-get update -y
         sudo apt-get install -y redis-server python-redis
         ;;
-    amqp1)
-	sudo yum install -y qpid-cpp-server qpid-proton-c-devel python-qpid-proton cyrus-sasl-lib cyrus-sasl-plain
-        ;;
     rabbit)
         sudo apt-get update -y
         sudo apt-get install -y rabbitmq-server

setup-test-env-amqp1.sh

@@ -115,6 +115,12 @@ EOF
 
 function _configure_qpidd {
 
+    QPIDD=$(which qpidd 2>/dev/null)
+    if [[ ! -x "$QPIDD" ]]; then
+        echo "FAILURE: qpidd broker not installed"
+        exit 1
+    fi
+
     [ -f "/usr/lib/qpid/daemon/acl.so" ] && LIBACL="load-module=/usr/lib/qpid/daemon/acl.so"
 
     cat > ${DATADIR}/qpidd.conf <<EOF
@@ -123,9 +129,11 @@ sasl-config=${DATADIR}/sasl2
 ${LIBACL}
 mgmt-enable=yes
 log-to-stderr=no
+data-dir=${DATADIR}/.qpidd
+pid-dir=${DATADIR}/.qpidd
 EOF
 
-if ! `$(which qpidd 2>/dev/null) --help | grep -q "sasl-service-name"`; then
+if ! `$QPIDD --help | grep -q "sasl-service-name"`; then
     echo "This version of $QPIDD does not support SASL authentication with AMQP 1.0"
     cat >> ${DATADIR}/qpidd.conf <<EOF
 auth=no
@@ -156,6 +164,7 @@ pwcheck_method: auxprop
 auxprop_plugin: sasldb
 sasldb_path: ${DATADIR}/qpidd.sasldb
 mech_list: PLAIN ANONYMOUS
+sql_select: dummy select
 EOF
 
 }
@@ -178,6 +187,7 @@ EOF
 }
 
 function _start_qpidd {
+    chmod -R a+r ${DATADIR}
     QPIDD=$(which qpidd 2>/dev/null)
     mkfifo ${DATADIR}/out
     $QPIDD --log-enable trace+ --log-to-file ${DATADIR}/out --config ${DATADIR}/qpidd.conf &

tools/test-setup.sh

@@ -28,6 +28,7 @@ PACKAGES=$(.tox/bindep/bin/bindep -b -f bindep.txt $BINDEP_PROFILE || true)
 
 # inspired from project-config install-distro-packages.sh
 if apt-get -v >/dev/null 2>&1 ; then
+    [ $BINDEP_PROFILE == amqp1 ] && sudo add-apt-repository -y ppa:qpid/testing
     sudo apt-get -qq update
     sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \
         apt-get -q --option "Dpkg::Options::=--force-confold" \

tox.ini

@@ -67,7 +67,6 @@ setenv =
     AMQP1_BACKEND=qpidd
     ENVNAME={envname}
     WORKDIR={toxworkdir}
-# NOTE(kgiusti): This gate job runs on Centos 7 for now.
 commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional'
 
 [testenv:py34-func-amqp1]
@@ -78,7 +77,6 @@ setenv =
     AMQP1_BACKEND=qpidd
     ENVNAME={envname}
     WORKDIR={toxworkdir}
-# NOTE(kgiusti): This gate job runs on Centos 7 for now.
 commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional'
 
 [testenv:py35-func-amqp1]
@@ -89,7 +87,6 @@ setenv =
     AMQP1_BACKEND=qpidd
     ENVNAME={envname}
     WORKDIR={toxworkdir}
-# NOTE(kgiusti): This gate job runs on Centos 7 for now.
 commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional'
 
 [testenv:py27-func-zeromq]