From 4e62564dfb56c5d85185e61ba0dec97cc2aa3d25 Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Tue, 19 Nov 2024 09:40:48 +0100
Subject: [PATCH] AppWrapper e2e: Remove creationTimestamp from marshalled
 template

---
 test/e2e/mnist_pytorch_appwrapper_test.go |  5 ++++-
 test/e2e/mnist_rayjob_raycluster_test.go  |  5 ++++-
 test/e2e/support.go                       | 11 +++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/test/e2e/mnist_pytorch_appwrapper_test.go b/test/e2e/mnist_pytorch_appwrapper_test.go
index 1919c616b..34fb742f0 100644
--- a/test/e2e/mnist_pytorch_appwrapper_test.go
+++ b/test/e2e/mnist_pytorch_appwrapper_test.go
@@ -145,6 +145,9 @@ func runMnistPyTorchAppWrapper(t *testing.T, accelerator string, numberOfGpus in
 		},
 	}
 
+	raw := Raw(test, job)
+	raw = RemoveCreationTimestamp(test, raw)
+
 	// Create an AppWrapper resource
 	aw := &mcadv1beta2.AppWrapper{
 		TypeMeta: metav1.TypeMeta{
@@ -159,7 +162,7 @@ func runMnistPyTorchAppWrapper(t *testing.T, accelerator string, numberOfGpus in
 		Spec: mcadv1beta2.AppWrapperSpec{
 			Components: []mcadv1beta2.AppWrapperComponent{
 				{
-					Template: Raw(test, job),
+					Template: raw,
 				},
 			},
 		},
diff --git a/test/e2e/mnist_rayjob_raycluster_test.go b/test/e2e/mnist_rayjob_raycluster_test.go
index c66fb28f3..b2e724834 100644
--- a/test/e2e/mnist_rayjob_raycluster_test.go
+++ b/test/e2e/mnist_rayjob_raycluster_test.go
@@ -135,6 +135,9 @@ func runMnistRayJobRayClusterAppWrapper(t *testing.T, accelerator string, number
 
 	// Create RayCluster, wrap in AppWrapper and assign to localqueue
 	rayCluster := constructRayCluster(test, namespace, mnist, numberOfGpus)
+	raw := Raw(test, rayCluster)
+	raw = RemoveCreationTimestamp(test, raw)
+
 	aw := &mcadv1beta2.AppWrapper{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: mcadv1beta2.GroupVersion.String(),
@@ -148,7 +151,7 @@ func runMnistRayJobRayClusterAppWrapper(t *testing.T, accelerator string, number
 		Spec: mcadv1beta2.AppWrapperSpec{
 			Components: []mcadv1beta2.AppWrapperComponent{
 				{
-					Template: Raw(test, rayCluster),
+					Template: raw,
 				},
 			},
 		},
diff --git a/test/e2e/support.go b/test/e2e/support.go
index 8fc862957..dec8915db 100644
--- a/test/e2e/support.go
+++ b/test/e2e/support.go
@@ -18,9 +18,12 @@ package e2e
 
 import (
 	"embed"
+	"strings"
 
 	"github.com/onsi/gomega"
 	"github.com/project-codeflare/codeflare-common/support"
+
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 //go:embed *.py *.txt *.sh
@@ -32,3 +35,11 @@ func ReadFile(t support.Test, fileName string) []byte {
 	t.Expect(err).NotTo(gomega.HaveOccurred())
 	return file
 }
+
+func RemoveCreationTimestamp(t support.Test, rawExtension runtime.RawExtension) runtime.RawExtension {
+	t.T().Helper()
+	patchedRaw := strings.ReplaceAll(string(rawExtension.Raw), `"metadata":{"creationTimestamp":null},`, "")
+	return runtime.RawExtension{
+		Raw: []byte(patchedRaw),
+	}
+}