diff --git a/.cirrus.yml b/.cirrus.yml index 016ef8f2b8..58f56798cd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -459,8 +459,6 @@ testing_task: # testing matrix. integration_test_temporary_task: - allow_failures: $CI == 'true' - depends_on: - "gating" - "varlink_api" diff --git a/foo b/foo new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 7233d169c8..6ca8a537c3 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -20,6 +20,7 @@ var _ = Describe("Podman attach", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 9e41fd231f..3ccee3575a 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -22,6 +22,7 @@ var _ = Describe("Podman build", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index 72387ed8c6..ceb656a017 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman commit", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/config.go b/test/e2e/config.go index 49a47c7da3..0e18506140 100644 --- a/test/e2e/config.go +++ b/test/e2e/config.go @@ -23,4 +23,8 @@ var ( // This image has a bogus/invalid seccomp profile which should // yield a json error when being read. alpineBogusSeccomp = "docker.io/libpod/alpine-with-bogus-seccomp:label" + + // v2fail is a temporary variable to help us track + // tests that fail in v2 + v2fail = "does not pass integration tests with v2 podman" ) diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index 91c0251975..cc986f1a8c 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman container inspect", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index a2ef7eb4ad..b984a35f32 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -23,6 +23,7 @@ var _ = Describe("Podman run", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index b71897cfd2..2ff6fe65ee 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -22,6 +22,7 @@ var _ = Describe("Podman cp", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index 6937956376..5e60837340 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -19,6 +19,7 @@ var _ = Describe("Podman create with --ip flag", func() { ) BeforeEach(func() { + Skip(v2fail) SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index 10742a0e84..82346823ab 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman create", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 8b95794d27..3aac4b35bc 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman exec", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index 1486427c5a..e25eb33c6c 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman image|container exists", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index 389f2c8225..e4f487634b 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -21,6 +21,7 @@ var _ = Describe("Podman generate kube", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index abfca4db9a..2901e7ac61 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman generate systemd", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index 19a8658acb..58d473ca82 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman healthcheck run", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 8b6b679a5c..c0165e0604 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -20,6 +20,7 @@ var _ = Describe("Podman images", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index 446dbc16e3..e5173e7a1f 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman Info", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index 919fe4abf7..6241f813fa 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman init", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index ebac087ac8..5ec1b51bba 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman inspect", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index 9a2cee9e19..6b6d3820a8 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -20,6 +20,7 @@ var _ = Describe("Podman load", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index 3f76daa678..dd35d8489d 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -32,6 +32,7 @@ var _ = Describe("Podman login and logout", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index 7eccaa9ab7..19dabced7f 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -76,6 +76,7 @@ var _ = Describe("Podman network create", func() { ) BeforeEach(func() { + Skip(v2fail) SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 440d307b55..2cb7eb144b 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -34,6 +34,7 @@ var _ = Describe("Podman network", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 39e08e2e8e..66b888803e 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -21,6 +21,7 @@ var _ = Describe("Podman pause", func() { createdState := "Created" BeforeEach(func() { + Skip(v2fail) SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 9daf266b8f..16f7af55e4 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -217,6 +217,7 @@ var _ = Describe("Podman generate kube", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index e0a10c202f..30abe2be26 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman pod create", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index c8072f3087..88644188b9 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -20,6 +20,7 @@ var _ = Describe("Podman pod create", func() { BeforeEach(func() { tempdir, err = CreateTempDirInTempDir() + Skip(v2fail) if err != nil { os.Exit(1) } diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go index d86c36f58b..06f36c751c 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman pod inspect", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index a3efec46c8..29d7664df1 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman pod kill", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index 73707926d2..bb17192031 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman pod pause", func() { pausedState := "Paused" BeforeEach(func() { + Skip(v2fail) SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { diff --git a/test/e2e/pod_pod_namespaces.go b/test/e2e/pod_pod_namespaces.go index 83c877f5a4..7acdfd3560 100644 --- a/test/e2e/pod_pod_namespaces.go +++ b/test/e2e/pod_pod_namespaces.go @@ -19,6 +19,7 @@ var _ = Describe("Podman pod create", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index d98383331a..d0725883c4 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman pod prune", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 551ad38183..ea9118f374 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman ps", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index 691fe5f0c2..9938c70b83 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman pod restart", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index 90f178be66..117b54987b 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -19,6 +19,7 @@ var _ = Describe("Podman pod rm", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index 2722cb5b3b..52ba03daef 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman pod start", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index 347f33e622..bb3610a279 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman pod stats", func() { ) BeforeEach(func() { + Skip(v2fail) cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() Expect(err).To(BeNil()) diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index a61917adb9..0c0085b82d 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman pod stop", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index c313b06750..2f75aaf30d 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -20,6 +20,7 @@ var _ = Describe("Podman top", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 5bb86d5589..ce31c9ad27 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -20,6 +20,7 @@ var _ = Describe("Podman port", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 83a8d3b188..e8a208c3c8 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -22,6 +22,7 @@ var _ = Describe("Podman prune", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index adbb9c16c4..26f283b9c4 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -21,6 +21,7 @@ var _ = Describe("Podman ps", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 96340ef30f..1531958258 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -22,6 +22,7 @@ var _ = Describe("Podman pull", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index 0747257bec..0991da8671 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -22,6 +22,7 @@ var _ = Describe("Podman push", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 2b515f53be..9bbeb4f684 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman restart", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 4eb5688792..83d20afa9b 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman rm", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 80e877de11..765d2b19e4 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman rmi", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index 14294eeacc..69b4f920cc 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman run with --cgroup-parent", func() { ) BeforeEach(func() { + Skip(v2fail) SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index eae3f574c3..2fc8129486 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman run device", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 02b9ff8d1b..749047b760 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman run dns", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index b1344a371f..ebc06b36c1 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman run entrypoint", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 5be9db8106..5946f3b7a9 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -19,6 +19,7 @@ var _ = Describe("Podman run networking", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index c8ba68efcc..9c914188a6 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -19,6 +19,7 @@ var _ = Describe("Podman run ns", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index bd6a0e0368..0868bce4f9 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman run passwd", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 8bbdf20568..28ab23ab0d 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman run restart containers", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index 358137aa9f..c2e4f2032a 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -19,6 +19,7 @@ var _ = Describe("Podman run", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index fbdd3acecd..58dde62da9 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -29,6 +29,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { ) BeforeEach(func() { + Skip(v2fail) tmpdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 9b6de6f652..c84bbe91ff 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -29,6 +29,7 @@ var _ = Describe("Podman run", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 25f12ec2ea..a4e99ab71d 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -22,6 +22,7 @@ var _ = Describe("Podman UserNS support", func() { ) BeforeEach(func() { + Skip(v2fail) if os.Getenv("SKIP_USERNS") != "" { Skip("Skip userns tests.") } diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index 1f892d9f8e..9da3c13402 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -27,6 +27,7 @@ var _ = Describe("Podman run with volumes", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index 41d61e9d9e..83fdcabc9a 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -31,6 +31,7 @@ var _ = Describe("podman container runlabel", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 9ba0241fed..3c64fa05f6 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -68,6 +68,7 @@ registries = ['{{.Host}}:{{.Port}}']` registryFileTwoTmpl := template.Must(template.New("registryFileTwo").Parse(regFileContents2)) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 47b0588451..5f6f5a8cf0 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman start", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index 762417a17f..32f7cc5202 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -21,6 +21,7 @@ var _ = Describe("Podman stats", func() { ) BeforeEach(func() { + Skip(v2fail) cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() Expect(err).To(BeNil()) diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 54c64d66b6..a0c573c557 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman stop", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index bbbdf30b0d..5f261fcbf9 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -20,6 +20,7 @@ var _ = Describe("podman system df", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go index e5ce697397..f177476485 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -17,6 +17,7 @@ var _ = Describe("podman system reset", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 9ec48ba00b..c56fb00f2f 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -23,6 +23,7 @@ var _ = Describe("Podman systemd", func() { ) BeforeEach(func() { + Skip(v2fail) SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index 8c97e6b288..2da3701940 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -21,6 +21,7 @@ var _ = Describe("Podman trust", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index 17171cd413..8b4b454dba 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman untag", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index c2af613aa5..036b6f621b 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman version", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go index 71023f9e24..4cfc5bfc9a 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman volume create", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index 5015e0535f..1197fa5525 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -17,6 +17,7 @@ var _ = Describe("Podman volume inspect", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index da2d7ae779..4073df59d9 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman volume ls", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index 3049646b08..137a2c41b2 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman volume prune", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index 6f20208282..e67cfcd118 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -16,6 +16,7 @@ var _ = Describe("Podman volume rm", func() { ) BeforeEach(func() { + Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1)