update e2e tests for OCL v1 API

Author: djoshy

test/e2e-ocl/helpers_test.go

@@ -205,22 +205,6 @@ func createSecret(t *testing.T, cs *framework.ClientSet, secret *corev1.Secret)
 	})
 }
 
-// Copies the global pull secret from openshift-config/pull-secret into the MCO
-// namespace so that it can be used by the build processes.
-func copyGlobalPullSecret(t *testing.T, cs *framework.ClientSet) func() {
-	src := metav1.ObjectMeta{
-		Name:      "pull-secret",
-		Namespace: "openshift-config",
-	}
-
-	dst := metav1.ObjectMeta{
-		Name:      globalPullSecretCloneName,
-		Namespace: ctrlcommon.MCONamespace,
-	}
-
-	return cloneSecret(t, cs, src, dst)
-}
-
 // Computes the name of the currently-running MachineOSBuild given a MachineConfigPool and MachineOSConfig.
 func getMachineOSBuildNameForPool(cs *framework.ClientSet, poolName, moscName string) (string, error) {
 	mcp, err := cs.MachineconfigurationV1Interface.MachineConfigPools().Get(context.TODO(), poolName, metav1.GetOptions{})
@@ -863,6 +847,13 @@ func getImagePullspecForFailureTest(ctx context.Context, cs *framework.ClientSet
 	}
 }
 
+func getBadContainerFileForFailureTest() []mcfgv1.MachineOSContainerfile {
+	return []mcfgv1.MachineOSContainerfile{{
+		ContainerfileArch: mcfgv1.NoArch,
+		Content:           "THIS IS A BAD CONTAINERFILE",
+	}}
+}
+
 // Talks to an image registry to get the digested image pullspec for the
 // supplied image pullspec. Note: Only supports public image registries. This
 // is the same as doing:

test/e2e-ocl/onclusterlayering_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/openshift/machine-config-operator/pkg/controller/build/buildrequest"
-	"github.com/openshift/machine-config-operator/pkg/controller/build/constants"
 	"github.com/openshift/machine-config-operator/pkg/controller/build/utils"
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -109,8 +108,6 @@ func TestOnClusterLayeringOnOKD(t *testing.T) {
 
 // Tests that an on-cluster build can be performed with the Custom Pod Builder.
 func TestOnClusterLayering(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
 
 	runOnClusterLayeringTest(t, onClusterLayeringTestOpts{
 		poolName: layeredMCPName,
@@ -119,6 +116,11 @@ func TestOnClusterLayering(t *testing.T) {
 		},
 	})
 
+	/* Removing this portion of this test - update when https://issues.redhat.com/browse/OCPBUGS-46421 fixed.
+
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
+
 	t.Logf("Applying rebuild annotation (%q) to MachineOSConfig (%q) to cause a rebuild", constants.RebuildMachineOSConfigAnnotationKey, layeredMCPName)
 
 	cs := framework.NewClientSet("")
@@ -132,6 +134,7 @@ func TestOnClusterLayering(t *testing.T) {
 	require.NoError(t, err)
 
 	waitForBuildToStartForPoolAndConfig(t, cs, layeredMCPName, layeredMCPName)
+	*/
 }
 
 // Tests that an on-cluster build can be performed and that the resulting image
@@ -313,75 +316,67 @@ func TestMachineConfigPoolChangeRestartsBuild(t *testing.T) {
 	require.NoError(t, err)
 }
 
-// This test starts a build with an image that is known to fail because it does
-// not have the necessary binaries within it. After failure, it edits the
-// MachineOSConfig with the expectation that the failed build and its objects
-// will be deleted and a new build will start in its place.
+// This test starts a build with an image that is known to fail because it uses
+// an invalid containerfile. After failure, it edits the  MachineOSConfig
+// with the expectation that the failed build and its  will be deleted and a new
+// build will start in its place.
 func TestGracefulBuildFailureRecovery(t *testing.T) {
 
-	//TODO: Update this test to use a bad container file
-	/*
-		ctx, cancel := context.WithCancel(context.Background())
-		t.Cleanup(cancel)
-
-		cs := framework.NewClientSet("")
-
-		mosc := prepareForOnClusterLayeringTest(t, cs, onClusterLayeringTestOpts{
-			poolName: layeredMCPName,
-			customDockerfiles: map[string]string{
-				layeredMCPName: cowsayDockerfile,
-			},
-		})
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
 
-		// Override the base OS container image to pull an invalid (and smaller)
-		// image that should produce a failure faster.
+	cs := framework.NewClientSet("")
 
-		pullspec, err := getImagePullspecForFailureTest(ctx, cs)
-		require.NoError(t, err)
+	mosc := prepareForOnClusterLayeringTest(t, cs, onClusterLayeringTestOpts{
+		poolName: layeredMCPName,
+		customDockerfiles: map[string]string{
+			layeredMCPName: cowsayDockerfile,
+		},
+	})
 
-		t.Logf("Overriding BaseImagePullspec for MachineOSConfig %s with %q to cause a build failure", mosc.Name, pullspec)
+	// Add a bad containerfile so that we can cause a build failure
+	t.Logf("Adding a bad containerfile for MachineOSConfig %s to cause a build failure", mosc.Name)
 
-		mosc.Spec.BuildInputs.BaseOSImagePullspec = pullspec
+	mosc.Spec.Containerfile = getBadContainerFileForFailureTest()
 
-		createMachineOSConfig(t, cs, mosc)
+	createMachineOSConfig(t, cs, mosc)
 
-		// Wait for the build to start.
-		firstMosb := waitForBuildToStartForPoolAndConfig(t, cs, layeredMCPName, mosc.Name)
+	// Wait for the build to start.
+	firstMosb := waitForBuildToStartForPoolAndConfig(t, cs, layeredMCPName, mosc.Name)
 
-		t.Logf("Waiting for MachineOSBuild %s to fail", firstMosb.Name)
+	t.Logf("Waiting for MachineOSBuild %s to fail", firstMosb.Name)
 
-		// Wait for the build to fail.
-		kubeassert := helpers.AssertClientSet(t, cs).WithContext(ctx)
-		kubeassert.Eventually().MachineOSBuildIsFailure(firstMosb)
+	// Wait for the build to fail.
+	kubeassert := helpers.AssertClientSet(t, cs).WithContext(ctx)
+	kubeassert.Eventually().MachineOSBuildIsFailure(firstMosb)
 
-		// Clear the overridden image pullspec.
-		apiMosc, err := cs.MachineconfigurationV1Interface.MachineOSConfigs().Get(ctx, mosc.Name, metav1.GetOptions{})
-		require.NoError(t, err)
+	// Clear the overridden image pullspec.
+	apiMosc, err := cs.MachineconfigurationV1Interface.MachineOSConfigs().Get(ctx, mosc.Name, metav1.GetOptions{})
+	require.NoError(t, err)
 
-		apiMosc.Spec.BaseOSImagePullspec = ""
+	apiMosc.Spec.Containerfile = []mcfgv1.MachineOSContainerfile{}
 
-		updated, err := cs.MachineconfigurationV1Interface.MachineOSConfigs().Update(ctx, apiMosc, metav1.UpdateOptions{})
-		require.NoError(t, err)
+	updated, err := cs.MachineconfigurationV1Interface.MachineOSConfigs().Update(ctx, apiMosc, metav1.UpdateOptions{})
+	require.NoError(t, err)
 
-		t.Logf("Cleared BaseImagePullspec to use default value")
+	t.Logf("Cleared out bad containerfile")
 
-		mcp, err := cs.MachineconfigurationV1Interface.MachineConfigPools().Get(ctx, layeredMCPName, metav1.GetOptions{})
-		require.NoError(t, err)
+	mcp, err := cs.MachineconfigurationV1Interface.MachineConfigPools().Get(ctx, layeredMCPName, metav1.GetOptions{})
+	require.NoError(t, err)
 
-		// Compute the new MachineOSBuild image name.
-		moscChangeMosb := buildrequest.NewMachineOSBuildFromAPIOrDie(ctx, cs.GetKubeclient(), updated, mcp)
+	// Compute the new MachineOSBuild image name.
+	moscChangeMosb := buildrequest.NewMachineOSBuildFromAPIOrDie(ctx, cs.GetKubeclient(), updated, mcp)
 
-		// Wait for the second build to start.
-		secondMosb := waitForBuildToStart(t, cs, moscChangeMosb)
+	// Wait for the second build to start.
+	secondMosb := waitForBuildToStart(t, cs, moscChangeMosb)
 
-		// Ensure that the first build is eventually cleaned up.
-		kubeassert.Eventually().MachineOSBuildDoesNotExist(firstMosb)
-		assertBuildObjectsAreDeleted(t, kubeassert.Eventually(), firstMosb)
+	// Ensure that the first build is eventually cleaned up.
+	kubeassert.Eventually().MachineOSBuildDoesNotExist(firstMosb)
+	assertBuildObjectsAreDeleted(t, kubeassert.Eventually(), firstMosb)
 
-		// Ensure that the second build is still running.
-		kubeassert.MachineOSBuildExists(secondMosb)
-		assertBuildObjectsAreCreated(t, kubeassert, secondMosb)
-	*/
+	// Ensure that the second build is still running.
+	kubeassert.MachineOSBuildExists(secondMosb)
+	assertBuildObjectsAreCreated(t, kubeassert, secondMosb)
 
 }
 
@@ -811,14 +806,11 @@ func prepareForOnClusterLayeringTest(t *testing.T, cs *framework.ClientSet, test
 	})
 
 	imagestreamObjMeta := metav1.ObjectMeta{
-		Name:      "os-image",
-		Namespace: strings.ToLower(t.Name()),
+		Name: "os-image",
 	}
 
 	pushSecretName, finalPullspec, _ := setupImageStream(t, cs, imagestreamObjMeta)
 
-	copyGlobalPullSecret(t, cs)
-
 	if testOpts.targetNode != nil {
 		makeIdempotentAndRegister(t, helpers.CreatePoolWithNode(t, cs, testOpts.poolName, *testOpts.targetNode))
 	} else {
@@ -860,9 +852,6 @@ func prepareForOnClusterLayeringTest(t *testing.T, cs *framework.ClientSet, test
 			MachineConfigPool: mcfgv1.MachineConfigPoolReference{
 				Name: testOpts.poolName,
 			},
-			BaseImagePullSecret: &mcfgv1.ImageSecretObjectReference{
-				Name: globalPullSecretCloneName,
-			},
 			RenderedImagePushSecret: mcfgv1.ImageSecretObjectReference{
 				Name: pushSecretName,
 			},