Skip to content

Minor changes to run API check in Jenkins PRs #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fceller merged 2 commits into from
Jun 16, 2020
Merged

Minor changes to run API check in Jenkins PRs #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
037969c
Minor changes to run API check in Jenkins PRs
KVS85 Mar 30, 2020
98afcae
Update cluster.sh
KVS85 Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ __test_go_test:
__test_prepare:
ifdef TEST_ENDPOINTS_OVERRIDE
@-docker rm -f -v $(TESTCONTAINER) &> /dev/null
@sleep 3
else
ifdef JWTSECRET
echo "$JWTSECRET" > "${JWTSECRETFILE}"
Expand All @@ -366,6 +367,8 @@ ifdef TESTCONTAINER
endif
ifndef TEST_ENDPOINTS_OVERRIDE
@TESTCONTAINER=$(TESTCONTAINER) ARANGODB=$(ARANGODB) STARTER=$(STARTER) STARTERMODE=$(TEST_MODE) "${ROOTDIR}/test/cluster.sh" cleanup
else
@-docker rm -f -v $(TESTCONTAINER) &> /dev/null
endif
@sleep 3

Expand Down
19 changes: 16 additions & 3 deletions test/cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ if [ -z "$TESTCONTAINER" ]; then
exit 1
fi

if [ -z "$STARTER" ]; then
echo "STARTER environment variable must be set"
exit 1
fi

NAMESPACE=${TESTCONTAINER}-ns
STARTERVOLUME=${TESTCONTAINER}-vol
STARTERCONTAINER=${TESTCONTAINER}-s
CMD=$1
DOCKERARGS=
STARTERARGS=

# Cleanup
docker rm -f -v $(docker ps -a | grep ${TESTCONTAINER} | awk '{print $1}') &> /dev/null
docker volume rm -f ${STARTERVOLUME} &> /dev/null

if [ "$CMD" == "start" ]; then
if [ -z "$ARANGODB" ]; then
echo "ARANGODB environment variable must be set"
Expand Down Expand Up @@ -46,15 +49,25 @@ if [ "$CMD" == "start" ]; then
STARTERARGS="$STARTERARGS --all.backup.api-enabled=true"
fi

if [ -z "$STARTERPORT" ]; then
STARTERPORT=7000
fi

# Start network namespace
docker run -d --name=${NAMESPACE} alpine:3.4 sleep 365d

# Start starters
# arangodb/arangodb-starter 0.7.0 or higher is needed.
echo "docker run -d --name=${STARTERCONTAINER} --net=container:${NAMESPACE} \
-v ${STARTERVOLUME}:/data -v /var/run/docker.sock:/var/run/docker.sock $DOCKERARGS \
${STARTER} \
--starter.port=${STARTERPORT} --starter.address=127.0.0.1 \
--docker.image=${ARANGODB} \
--starter.local --starter.mode=${STARTERMODE} --all.log.output=+ $STARTERARGS"
docker run -d --name=${STARTERCONTAINER} --net=container:${NAMESPACE} \
-v ${STARTERVOLUME}:/data -v /var/run/docker.sock:/var/run/docker.sock $DOCKERARGS \
${STARTER} \
--starter.port=7000 --starter.address=127.0.0.1 \
--starter.port=${STARTERPORT} --starter.address=127.0.0.1 \
--docker.image=${ARANGODB} \
--starter.local --starter.mode=${STARTERMODE} --all.log.output=+ $STARTERARGS
fi