zuul/nodepool
Code Issues Proposed changes

Merge "Update unit test container setup and instructions"

Browse Source
This commit is contained in:
Zuul 2022-08-05 22:23:41 +00:00 committed by Gerrit Code Review
commit ebc8a0a664
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
TESTING.rst
View File

@ -18,15 +18,13 @@ More information on pip here: http://www.pip-installer.org/en/latest/
sudo pip3 install tox sudo pip3 install tox
A running zookeeper is required to execute tests. A running zookeeper is required to execute tests, but it also needs to be
configured for TLS and a certificate authority set up to handle socket
authentication. Because of these complexities, it's recommended to use a
helper script to set up these dependencies::
*Install zookeeper*:: sudo apt-get install docker-compose # or podman-compose if preferred
ROOTCMD=sudo tools/test-setup-docker.sh
sudo apt-get install zookeeperd
*Start zookeeper*::
sudo service zookeeper start
Run The Tests Run The Tests
------------- -------------

13
tools/test-setup-docker.sh
View File

@ -3,9 +3,12 @@
# This runs ZooKeeper in a docker container, which is required for # This runs ZooKeeper in a docker container, which is required for
# tests. # tests.
# This setup needs to be run as a user that can run docker or podman. # This setup needs to be run as a user that can run docker or podman, or by
# setting $ROOTCMD to a user substitution tool like "sudo" in the calling
# environment.
set -xeu set -xeu
ROOTCMD=${ROOTCMD:-}
cd $(dirname $0) cd $(dirname $0)
SCRIPT_DIR="$(pwd)" SCRIPT_DIR="$(pwd)"
@ -13,8 +16,8 @@ SCRIPT_DIR="$(pwd)"
# Select docker or podman # Select docker or podman
if command -v docker > /dev/null; then if command -v docker > /dev/null; then
DOCKER=docker DOCKER=docker
if ! docker ps; then if ! ${ROOTCMD} docker ps; then
systemctl start docker ${ROOTCMD} systemctl start docker
fi fi
elif command -v podman > /dev/null; then elif command -v podman > /dev/null; then
DOCKER=podman DOCKER=podman
@ -38,8 +41,8 @@ CA_DIR=$SCRIPT_DIR/ca
mkdir -p $CA_DIR mkdir -p $CA_DIR
$SCRIPT_DIR/zk-ca.sh $CA_DIR nodepool-test-zookeeper $SCRIPT_DIR/zk-ca.sh $CA_DIR nodepool-test-zookeeper
${COMPOSE} down ${ROOTCMD} ${COMPOSE} down
${COMPOSE} up -d ${ROOTCMD} ${COMPOSE} up -d
echo "Finished" echo "Finished"