From 94e1195021fc0be336af73bc11ade88e32273648 Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Wed, 27 Nov 2024 13:02:53 +0100
Subject: [PATCH] test commit

---
 .github/workflows/e2e_tests.yaml          | 3 +++
 Makefile                                  | 6 +++++-
 test/e2e/mnist_pytorch_appwrapper_test.go | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
index 7c836565..c6cccde5 100644
--- a/.github/workflows/e2e_tests.yaml
+++ b/.github/workflows/e2e_tests.yaml
@@ -75,6 +75,9 @@ jobs:
           kind load image-archive cfo.tar --name cluster --verbosity 1000
           make deploy -e IMG="${IMG}" -e ENV="e2e"
           kubectl wait --timeout=120s --for=condition=Available=true deployment -n openshift-operators codeflare-operator-manager
+        env:
+          # cgroup-manager configuration is required for NVidia image used in e2e PR check
+          IMAGE_BUILD_FLAGS: '--cgroup-manager cgroupfs'
 
       - name: Run e2e tests
         run: |
diff --git a/Makefile b/Makefile
index 5ae089c5..c014c0b8 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,10 @@ endif
 
 # Image URL to use all building/pushing image targets
 IMG ?= ${IMAGE_TAG_BASE}:${VERSION}
+
+# IMAGE_BUILD_FLAGS are the flags passed to the podman operator image build command
+IMAGE_BUILD_FLAGS := ""
+
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.24.2
 
@@ -184,7 +188,7 @@ run: manifests fmt vet ## Run a controller from your host.
 
 .PHONY: image-build
 image-build: test-unit ## Build container image with the manager.
-	podman build -t ${IMG} .
+	podman $(IMAGE_BUILD_FLAGS) build -t ${IMG} .
 
 .PHONY: image-push
 image-push: image-build ## Push container image with the manager.
diff --git a/test/e2e/mnist_pytorch_appwrapper_test.go b/test/e2e/mnist_pytorch_appwrapper_test.go
index 34fb742f..b4ec5780 100644
--- a/test/e2e/mnist_pytorch_appwrapper_test.go
+++ b/test/e2e/mnist_pytorch_appwrapper_test.go
@@ -202,3 +202,4 @@ func runMnistPyTorchAppWrapper(t *testing.T, accelerator string, numberOfGpus in
 	test.T().Logf("Waiting for AppWrapper %s/%s to be deleted", aw.Namespace, aw.Name)
 	test.Eventually(AppWrappers(test, namespace), TestTimeoutShort).Should(BeEmpty())
 }
+//test