summaryrefslogtreecommitdiff
path: root/contrib/cirrus/container_test.sh
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2019-05-28 15:12:04 -0600
committerEd Santiago <santiago@redhat.com>2019-06-03 05:34:31 -0600
commita47bb4d29f0b5e021645a7b755dd882806a536ca (patch)
treeb304f6171dd45cd519d78444a8a56106754e301c /contrib/cirrus/container_test.sh
parent176a41c355bdc567978f4417e5bd2d3c7cdce914 (diff)
downloadpodman-a47bb4d29f0b5e021645a7b755dd882806a536ca.tar.gz
podman-a47bb4d29f0b5e021645a7b755dd882806a536ca.tar.bz2
podman-a47bb4d29f0b5e021645a7b755dd882806a536ca.zip
cirrus: minor cleanup and refactoring
...with the goal of (very soon) reusing this code, in #2947, to run system tests in CI. This is the cleanest way I can think of to do so without duplication or a large maintenance burden. Changes are: - replace references to 'ginkgo' with 'integration'. That target is already in Makefile, and is not only more readable, it's also more abstract. There is no reason for this level of code to know about ginkgo. - allow rootless_test.sh to accept an argument, that being the name of the test suite to run (default: integration). #2947 will enable 'system'. - allow integration_test.sh to serve multiple purposes, by checking its filename. #2947 will add a symlink, system_test.sh, which will then cascade down to invoke system tests. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib/cirrus/container_test.sh')
-rw-r--r--contrib/cirrus/container_test.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh
index a0542f4a0..27baf0ad7 100644
--- a/contrib/cirrus/container_test.sh
+++ b/contrib/cirrus/container_test.sh
@@ -133,8 +133,8 @@ fi
if [ $integrationtest -eq 1 ]; then
make TAGS="${TAGS}" test-binaries
make varlink_generate
- make ginkgo $INTEGRATION_TEST_ENVS
+ make localintegration $INTEGRATION_TEST_ENVS
if [ $remote -eq 1 ]; then
- make ginkgo-remote $INTEGRATION_TEST_ENVS
+ make remoteintegration $INTEGRATION_TEST_ENVS
fi
fi