summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-03-12 12:59:56 -0500
committerbaude <bbaude@redhat.com>2019-03-13 12:10:35 -0500
commitc8ca027938b397d52a3064c5b5b10f6707e5f38c (patch)
tree336b80a2b18f93ee6870ac168c5bd692a82ad368
parent8b3f759800ebd6e53e0a807728ede633aa9bdb36 (diff)
downloadpodman-c8ca027938b397d52a3064c5b5b10f6707e5f38c.tar.gz
podman-c8ca027938b397d52a3064c5b5b10f6707e5f38c.tar.bz2
podman-c8ca027938b397d52a3064c5b5b10f6707e5f38c.zip
Add gating tasks
to protect against regressions, we need to add a few gating tasks: * build with varlink * build podman-remote * build podman-remote-darwin we already have a gating task for building without varlink Signed-off-by: baude <bbaude@redhat.com>
-rw-r--r--.cirrus.yml4
-rw-r--r--Makefile2
-rw-r--r--libpod/runtime_volume_unsupported.go2
-rw-r--r--pkg/rootless/rootless_unsupported.go2
4 files changed, 6 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 9ce690196..8e26ce72e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -135,8 +135,10 @@ gating_task:
# This task builds Podman with different buildtags to ensure the build does
# not break.
build_script:
+ - '/usr/local/bin/entrypoint.sh clean podman'
+ - '/usr/local/bin/entrypoint.sh clean podman-remote'
- '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp"'
-
+ - '/usr/local/bin/entrypoint.sh clean podman-remote-darwin'
build_each_commit_task:
diff --git a/Makefile b/Makefile
index b456b4acf..782fa4e62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 4b80517b6a638ff06f8ad432f0f0f5839283d058
+EPOCH_TEST_COMMIT ?= 1c45b42e9ff972d9645735118635e4186e6411f8
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/libpod/runtime_volume_unsupported.go b/libpod/runtime_volume_unsupported.go
index d87459759..5fe487114 100644
--- a/libpod/runtime_volume_unsupported.go
+++ b/libpod/runtime_volume_unsupported.go
@@ -6,7 +6,7 @@ import (
"context"
)
-func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force, prune bool) error {
+func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool) error {
return ErrNotImplemented
}
diff --git a/pkg/rootless/rootless_unsupported.go b/pkg/rootless/rootless_unsupported.go
index 54e70961b..e01d7855c 100644
--- a/pkg/rootless/rootless_unsupported.go
+++ b/pkg/rootless/rootless_unsupported.go
@@ -41,7 +41,7 @@ func SkipStorageSetup() bool {
// JoinNS re-exec podman in a new userNS and join the user namespace of the specified
// PID.
-func JoinNS(pid uint) (bool, int, error) {
+func JoinNS(pid uint, preserveFDs int) (bool, int, error) {
return false, -1, errors.New("this function is not supported on this os")
}