summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-02-28 18:43:18 -0500
committerGitHub <noreply@github.com>2022-02-28 18:43:18 -0500
commit86a057e6be434159e3e60add5a7a7d649e0b4ad5 (patch)
treecd12d6a52bc7b9dcd28492c204fe94242d41ff16
parent4c529529bd19c3cc73f630f39bb2b8df68374ad3 (diff)
parentdbf34bfe70740c73393a8cc83f2f2bc0f593e34b (diff)
downloadpodman-86a057e6be434159e3e60add5a7a7d649e0b4ad5.tar.gz
podman-86a057e6be434159e3e60add5a7a7d649e0b4ad5.tar.bz2
podman-86a057e6be434159e3e60add5a7a7d649e0b4ad5.zip
Merge pull request #13374 from cevich/fix_dupe_docker_testing
Clarify v2 API testing for podman vs docker clients
-rwxr-xr-xcontrib/cirrus/runner.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 6376bafa2..3aa69183e 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -55,7 +55,11 @@ function _run_unit() {
}
function _run_apiv2() {
- make localapiv2 |& logformatter
+ local m="Testing of API was performed using the **PODMAN*** client"
+ warn "$m"
+ if ! make localapiv2 |& logformatter; then
+ die "$m"
+ fi
}
function _run_compose() {
@@ -96,8 +100,12 @@ function _run_bindings() {
}
function _run_docker-py() {
+ m="Testing of API was performed using the **DOCKER** client"
+ warn "$m"
source venv/bin/activate
- make run-docker-py-tests
+ if ! make run-docker-py-tests; then
+ die "$m"
+ fi
}
function _run_endpoint() {