skip skopeo tests in CI for now

Author: cheesesashimi

test/e2e-ocl/imagepruner_test.go

@@ -59,6 +59,7 @@ func TestImagePruner(t *testing.T) {
 	t.Parallel()
 
 	skipIfUnableToRun(t)
+	skipIfSkopeoMissingInCI(t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
@@ -198,6 +199,13 @@ func TestImagePrunerOnCluster(t *testing.T) {
 
 	t.Run("Push image and inspect", func(t *testing.T) {
 		t.Parallel()
+
+		// This test requires skopeo which is missing in the CI environment. It is
+		// possible to customize the CI environment by using a different image, but
+		// doing so tweaking openshift/release configs and adding another
+		// Dockerfile.
+		skipIfSkopeoMissingInCI(t)
+
 		require.NoError(t, createAndPushScratchImage(ctx, t, pullspec, secretPath, certsDir))
 		imgPruner := imagepruner.NewImageInspectorDeleter()
 		sysCtx := &types.SystemContext{DockerCertPath: certsDir, AuthFilePath: secretPath}
@@ -658,6 +666,19 @@ func skipIfUnableToRun(t *testing.T) {
 	}
 }
 
+// Determines if the test should be skipped in CI because the skopeo binary is
+// missing. We skip this for now because getting the skopeo binary into the CI
+// test environment is a bit involved.
+func skipIfSkopeoMissingInCI(t *testing.T) {
+	if _, err := exec.LookPath("skopeo"); err != nil {
+		if helpers.InCI() {
+			t.Skip("Skipping because of missing skopeo binary")
+		} else {
+			t.Fatalf("Skopeo binary missing; did you install it?")
+		}
+	}
+}
+
 // Creates a new imagepruner instance with empty creds.
 func setupImagePrunerForTestWithEmptyCreds(t *testing.T) (imagepruner.ImagePruner, *corev1.Secret, error) {
 	// Write an "empty" creds file since we don't actually need creds for this test.

test/helpers/idempotent.go

@@ -53,20 +53,20 @@ type IdempotentConfig struct {
 	SkipOnlyOnFailure bool
 	// Whether the test failed or not. Private because we set it from testing.T.
 	testFailed bool
-	// Whether we're running in CI. Private because we set it using the inCI()
+	// Whether we're running in CI. Private because we set it using the InCI()
 	// helper.
 	inCI bool
 }
 
 func (i *IdempotentConfig) shouldRun() bool {
 	// If skipCleanupAlways is set, then we should not run cleanups regardless of
-	// outcome. This takes precedence over the inCI() check.
+	// outcome. This takes precedence over the InCI() check.
 	if i.SkipAlways {
 		return false
 	}
 
 	// If the test failed and skipCleanupOnlyAfterFailure is set, we should skip
-	// cleanup. This takes precedence over the inCI() check.
+	// cleanup. This takes precedence over the InCI() check.
 	if i.testFailed && i.SkipOnlyOnFailure {
 		return false
 	}
@@ -88,13 +88,13 @@ func (i *IdempotentConfig) shouldRun() bool {
 // In CI, we generally don't want to skip cleanups in the event of failure.
 func MakeConfigurableIdempotentAndRegister(t TestingT, shouldRunCfg IdempotentConfig, f func()) func() {
 	shouldRunCfg.testFailed = t.Failed()
-	shouldRunCfg.inCI = inCI()
+	shouldRunCfg.inCI = InCI()
 	return MakeIdempotentSkippableAndRegister(t, shouldRunCfg.shouldRun, f)
 }
 
 // Determines if we're running in a CI system based upon the presence (or lack
 // thereof) of certain environment variables.
-func inCI() bool {
+func InCI() bool {
 	items := []string{
 		// Specific to OpenShift CI.
 		"OPENSHIFT_CI",