opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3217 from edsantiago/cirrus_cleanup

Browse Source 
cirrus: minor cleanup and refactoring
This commit is contained in:
OpenShift Merge Robot
2019-06-03 21:51:09 +02:00
committed by GitHub
parent e41162076a a47bb4d29f
commit 0ede794da9
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/cirrus/container_test.sh
View File

@ -133,8 +133,8 @@ fi
if [ $integrationtest -eq 1 ]; then if [ $integrationtest -eq 1 ]; then
make TAGS="${TAGS}" test-binaries make TAGS="${TAGS}" test-binaries
make varlink_generate make varlink_generate
make ginkgo $INTEGRATION_TEST_ENVS make localintegration $INTEGRATION_TEST_ENVS
if [ $remote -eq 1 ]; then if [ $remote -eq 1 ]; then
make ginkgo-remote $INTEGRATION_TEST_ENVS make remoteintegration $INTEGRATION_TEST_ENVS
fi fi
fi fi

16
contrib/cirrus/integration_test.sh
View File

@ -5,6 +5,14 @@ source $(dirname $0)/lib.sh
req_env_var GOSRC SCRIPT_BASE OS_RELEASE_ID OS_RELEASE_VER CONTAINER_RUNTIME req_env_var GOSRC SCRIPT_BASE OS_RELEASE_ID OS_RELEASE_VER CONTAINER_RUNTIME
# Our name must be of the form xxxx_test or xxxx_test.sh, where xxxx is
# the test suite to run; currently (2019-05) the only option is 'integration'
# but pr2947 intends to add 'system'.
TESTSUITE=$(expr $(basename $0) : '\(.*\)_test')
if [[ -z $TESTSUITE ]]; then
die 1 "Script name is not of the form xxxx_test.sh"
fi
cd "$GOSRC" cd "$GOSRC"
if [[ "$SPECIALMODE" == "in_podman" ]] if [[ "$SPECIALMODE" == "in_podman" ]]
@ -28,11 +36,11 @@ then
if [[ "$USER" == "$ROOTLESS_USER" ]] if [[ "$USER" == "$ROOTLESS_USER" ]]
then then
$GOSRC/$SCRIPT_BASE/rootless_test.sh $GOSRC/$SCRIPT_BASE/rootless_test.sh ${TESTSUITE}
else else
ssh $ROOTLESS_USER@localhost \ ssh $ROOTLESS_USER@localhost \
-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no \ -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no \
$GOSRC/$SCRIPT_BASE/rootless_test.sh $GOSRC/$SCRIPT_BASE/rootless_test.sh ${TESTSUITE}
fi fi
else else
make make
@ -40,9 +48,9 @@ else
make test-binaries make test-binaries
if [[ "$TEST_REMOTE_CLIENT" == "true" ]] if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
then then
make remoteintegration make remote${TESTSUITE}
else else
make localintegration make local${TESTSUITE}
fi fi
exit $? exit $?
fi fi

10
contrib/cirrus/rootless_test.sh
View File

@ -18,6 +18,12 @@ then
exit 1 exit 1
fi fi
# Which set of tests to run; possible alternative is "system"
TESTSUITE=integration
if [[ -n "$*" ]]; then
TESTSUITE="$1"
fi
# Ensure environment setup correctly # Ensure environment setup correctly
req_env_var GOSRC ROOTLESS_USER req_env_var GOSRC ROOTLESS_USER
@ -34,7 +40,7 @@ make
make varlink_generate make varlink_generate
make test-binaries make test-binaries
if [ $remote -eq 0 ]; then if [ $remote -eq 0 ]; then
make ginkgo make local${TESTSUITE}
else else
make ginkgo-remote make remote${TESTSUITE}
fi fi