Merge pull request #3089 from baude/splittest

split remote tests from distro tests
This commit is contained in:
OpenShift Merge Robot
2019-05-15 22:20:04 +02:00
committed by GitHub
7 changed files with 33 additions and 3 deletions

View File

@ -73,6 +73,7 @@ env:
#### Default to NOT operating in any special-case testing mode #### Default to NOT operating in any special-case testing mode
#### ####
SPECIALMODE: "none" # don't do anything special SPECIALMODE: "none" # don't do anything special
TEST_REMOTE_CLIENT: false # don't test remote client by default
#### ####
#### Credentials and other secret-sauces, decrypted at runtime when authorized. #### Credentials and other secret-sauces, decrypted at runtime when authorized.
@ -266,6 +267,11 @@ testing_task:
- "vendor" - "vendor"
- "build_each_commit" - "build_each_commit"
env:
matrix:
TEST_REMOTE_CLIENT: true
TEST_REMOTE_CLIENT: false
gce_instance: gce_instance:
image_project: "libpod-218412" image_project: "libpod-218412"
zone: "us-central1-a" # Required by Cirrus for the time being zone: "us-central1-a" # Required by Cirrus for the time being

View File

@ -212,7 +212,9 @@ ginkgo:
ginkgo-remote: ginkgo-remote:
ginkgo -v -tags "$(BUILDTAGS) remoteclient" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. ginkgo -v -tags "$(BUILDTAGS) remoteclient" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/.
localintegration: varlink_generate test-binaries ginkgo ginkgo-remote localintegration: varlink_generate test-binaries ginkgo
remoteintegration: varlink_generate test-binaries ginkgo-remote
localsystem: .install.ginkgo localsystem: .install.ginkgo
ginkgo -v -noColor test/system/ ginkgo -v -noColor test/system/
@ -262,7 +264,9 @@ install: .gopathok install.bin install.man install.cni install.systemd ## Insta
install.bin: install.bin:
install ${SELINUXOPT} -d -m 755 $(BINDIR) install ${SELINUXOPT} -d -m 755 $(BINDIR)
install ${SELINUXOPT} -m 755 bin/podman $(BINDIR)/podman install ${SELINUXOPT} -m 755 bin/podman $(BINDIR)/podman
install ${SELINUXOPT} -m 755 bin/podman-remote $(BINDIR)/podman-remote
test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman
test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman-remote
install.man: docs install.man: docs
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1 install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1

View File

@ -36,6 +36,7 @@ else
make make
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc
make test-binaries make test-binaries
make install.tools
clean_env clean_env
case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
@ -49,6 +50,11 @@ else
;; ;;
*) bad_os_id_ver ;; *) bad_os_id_ver ;;
esac esac
if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
then
make remoteintegration
else
make localintegration make localintegration
fi
exit $? exit $?
fi fi

View File

@ -36,6 +36,7 @@ then
"export OS_RELEASE_ID=\"$(os_release_id)\"" \ "export OS_RELEASE_ID=\"$(os_release_id)\"" \
"export OS_RELEASE_VER=\"$(os_release_ver)\"" \ "export OS_RELEASE_VER=\"$(os_release_ver)\"" \
"export OS_REL_VER=\"$(os_release_id)-$(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 BUILT_IMAGE_SUFFIX=\"-$CIRRUS_REPO_NAME-${CIRRUS_CHANGE_IN_REPO:0:8}\"" \
"export GOPATH=\"/var/tmp/go\"" \ "export GOPATH=\"/var/tmp/go\"" \
'export PATH="$HOME/bin:$GOPATH/bin:/usr/local/bin:$PATH"' \ 'export PATH="$HOME/bin:$GOPATH/bin:/usr/local/bin:$PATH"' \

View File

@ -185,6 +185,14 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8
%{repo} provides a library for applications looking to use %{repo} provides a library for applications looking to use
the Container Pod concept popularized by Kubernetes. 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} %if 0%{?with_devel}
%package devel %package devel
Summary: Library for applications looking to use Container Pods 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 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
%endif %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 %changelog
* Sat Aug 4 2018 Dan Walsh <dwalsh@redhat.com> - 0.8.1-1.git6b4ab2a * Sat Aug 4 2018 Dan Walsh <dwalsh@redhat.com> - 0.8.1-1.git6b4ab2a
- Bump to v0.8.1 - Bump to v0.8.1

View File

@ -24,7 +24,6 @@ var _ = Describe("Podman Info", func() {
} }
podmanTest = PodmanTestCreate(tempdir) podmanTest = PodmanTestCreate(tempdir)
podmanTest.Setup() podmanTest.Setup()
podmanTest.DelayForVarlink()
}) })
AfterEach(func() { AfterEach(func() {

View File

@ -77,6 +77,7 @@ func (p *PodmanTestIntegration) StartVarlink() {
command.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} command.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
p.VarlinkCommand = command p.VarlinkCommand = command
p.VarlinkSession = command.Process p.VarlinkSession = command.Process
p.DelayForVarlink()
} }
func (p *PodmanTestIntegration) StopVarlink() { func (p *PodmanTestIntegration) StopVarlink() {