From a6b24f0a252c80828f08b774f995b502e0f35a29 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 6 Mar 2018 15:38:48 -0500 Subject: [PATCH] Add zookeeper to bindep This is to work around a bug in zuul, where it needs zookeeper to be installed to start properly. Change-Id: I75498a71af1290db1b2d1fb0214b5ecc393b1e4d Signed-off-by: Paul Belanger --- .zuul.yaml | 1 + bindep.txt | 6 ++++++ tools/test-setup.sh | 8 ++++++++ 3 files changed, 15 insertions(+) create mode 100755 tools/test-setup.sh diff --git a/.zuul.yaml b/.zuul.yaml index 8ed888c..54bf629 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,6 @@ - job: name: ansible-role-zuul + parent: unittests run: tests/test.yaml post-run: tests/collect-logs.yaml required-projects: diff --git a/bindep.txt b/bindep.txt index fe28f49..4ef2224 100644 --- a/bindep.txt +++ b/bindep.txt @@ -7,3 +7,9 @@ libselinux-python [platform:rpm] libssl-dev [platform:dpkg] openssl-devel [platform:rpm] python2-dnf [platform:fedora] + +# NOTE(pabelanger): This is because of a bug in zuul, when zuul-scheduler starts +# it will fail unless it cannot connect to zookeeper. However, zuul should be +# smart enough to try forever to connect. +zookeeperd [platform:dpkg] +zookeeper [platform:fedora] diff --git a/tools/test-setup.sh b/tools/test-setup.sh new file mode 100755 index 0000000..dab8196 --- /dev/null +++ b/tools/test-setup.sh @@ -0,0 +1,8 @@ +#!/bin/bash -xe + +# This script will be run by OpenStack CI before unit tests are run, +# it sets up the test system as needed. +# Developers should setup their test systems in a similar way. + +# Be sure zookeeper is started. +sudo service zookeeper start