WIP: test/e2e: remove toolbox test

The toolbox tests need to pull a big image and are very slow (almost a minute) so remove them. TODO should look at replacing some of the tests with other images to not loose coverage. Signed-off-by: Paul Holzinger <[email protected]>
containers · Apr 29, 2024 · 3030ec7 · 3030ec7
1 parent c6aef94
commit 3030ec7
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 210 deletions.
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
@@ -152,7 +152,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
  podman := PodmanTestSetup(filepath.Join(globalTmpDir, "image-init"))
 
  // Pull cirros but don't put it into the cache
- pullImages := []string{CIRROS_IMAGE, fedoraToolbox, volumeTest}
+ pullImages := []string{CIRROS_IMAGE, volumeTest}
  pullImages = append(pullImages, CACHE_IMAGES...)
  for _, image := range pullImages {
  podman.createArtifact(image)

diff --git a/test/e2e/config.go b/test/e2e/config.go
@@ -13,7 +13,6 @@ var (
  INFRA_IMAGE = "quay.io/libpod/k8s-pause:3.5" //nolint:revive,stylecheck
  BB = "quay.io/libpod/busybox:latest"
  HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest" //nolint:revive,stylecheck
- fedoraToolbox = "registry.fedoraproject.org/fedora-toolbox:36"
  volumeTest = "quay.io/libpod/volume-plugin-test-img:20220623"
 
  // This image has seccomp profiles that blocks all syscalls.

diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go
@@ -1,15 +1,15 @@
 package integration
 
 var (
- STORAGE_FS = "overlay"  //nolint:revive,stylecheck
- STORAGE_OPTIONS = "--storage-driver overlay"  //nolint:revive,stylecheck
- ROOTLESS_STORAGE_FS = "overlay"  //nolint:revive,stylecheck
- ROOTLESS_STORAGE_OPTIONS = "--storage-driver overlay"  //nolint:revive,stylecheck
- CACHE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE, fedoraToolbox} //nolint:revive,stylecheck
- NGINX_IMAGE = "quay.io/libpod/alpine_nginx:latest"  //nolint:revive,stylecheck
- BB_GLIBC = "docker.io/library/busybox:glibc"  //nolint:revive,stylecheck
- REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2"  //nolint:revive,stylecheck
- CITEST_IMAGE = "quay.io/libpod/testimage:20240123"  //nolint:revive,stylecheck
- SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124"  //nolint:revive,stylecheck
- CIRROS_IMAGE = "quay.io/libpod/cirros:latest"  //nolint:revive,stylecheck
+ STORAGE_FS = "overlay" //nolint:revive,stylecheck
+ STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive,stylecheck
+ ROOTLESS_STORAGE_FS = "overlay" //nolint:revive,stylecheck
+ ROOTLESS_STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive,stylecheck
+ CACHE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE} //nolint:revive,stylecheck
+ NGINX_IMAGE = "quay.io/libpod/alpine_nginx:latest" //nolint:revive,stylecheck
+ BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck
+ REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive,stylecheck
+ CITEST_IMAGE = "quay.io/libpod/testimage:20240123" //nolint:revive,stylecheck
+ SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive,stylecheck
+ CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive,stylecheck
 )