From a86aa4b1e92a7d53c932dd0b06c9f51bfce47e18 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Wed, 8 May 2019 15:21:33 -0500
Subject: split remote tests from distro tests

We want the remote tests for our distributions to be tested in a
different VM than the local tests.  This allows for faster CI runs and
easier debug as well as seperation of flakes.

Signed-off-by: baude <bbaude@redhat.com>
---
 contrib/cirrus/integration_test.sh  |  8 +++++++-
 contrib/cirrus/setup_environment.sh |  1 +
 contrib/spec/podman.spec.in         | 13 +++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'contrib')

diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index 5b73f0c6c..c7d381318 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -36,6 +36,7 @@ else
     make
     make install PREFIX=/usr ETCDIR=/etc
     make test-binaries
+    make install.tools
     clean_env
 
     case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
@@ -49,6 +50,11 @@ else
             ;;
         *) bad_os_id_ver ;;
     esac
-    make localintegration
+    if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
+    then
+        make remoteintegration
+    else
+        make localintegration
+    fi
     exit $?
 fi
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 2f9b1d796..30bca9af2 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -36,6 +36,7 @@ then
         "export OS_RELEASE_ID=\"$(os_release_id)\"" \
         "export OS_RELEASE_VER=\"$(os_release_ver)\"" \
         "export OS_REL_VER=\"$(os_release_id)-$(os_release_ver)\"" \
+        "export TEST_REMOTE_CLIENT=\"$TEST_REMOTE_CLIENT\"" \
         "export BUILT_IMAGE_SUFFIX=\"-$CIRRUS_REPO_NAME-${CIRRUS_CHANGE_IN_REPO:0:8}\"" \
         "export GOPATH=\"/var/tmp/go\"" \
         'export PATH="$HOME/bin:$GOPATH/bin:/usr/local/bin:$PATH"' \
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index d69b673e0..29c786ca6 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -185,6 +185,14 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8
 %{repo} provides a library for applications looking to use
 the Container Pod concept popularized by Kubernetes.
 
+%package remote
+Summary:       Remote Podman client
+
+%description -n podman-remote
+%{summary}
+This package provides the Podman remote client which
+can be used to access Podman running on a server.
+
 %if 0%{?with_devel}
 %package devel
 Summary:       Library for applications looking to use Container Pods
@@ -491,6 +499,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
 %endif
 
+%files -n podman-remote
+%license LICENSE
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
+%{_bindir}/%{name}-remote
+
 %changelog
 * Sat Aug 4 2018 Dan Walsh <dwalsh@redhat.com> - 0.8.1-1.git6b4ab2a
 - Bump to v0.8.1
-- 
cgit v1.2.3-54-g00ecf