Skip to content

Commit 390fb17

Browse files
sutaakaropenshift-merge-bot[bot]
authored andcommitted
Add --cgroup-manager cgroupfs for e2e PR check
1 parent dd6851a commit 390fb17

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.github/workflows/e2e_tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ jobs:
7575
kind load image-archive cfo.tar --name cluster --verbosity 1000
7676
make deploy -e IMG="${IMG}" -e ENV="e2e"
7777
kubectl wait --timeout=120s --for=condition=Available=true deployment -n openshift-operators codeflare-operator-manager
78+
env:
79+
# cgroup-manager configuration is required for NVidia image used in e2e PR check
80+
IMAGE_BUILD_FLAGS: '--cgroup-manager cgroupfs'
7881

7982
- name: Run e2e tests
8083
run: |

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ endif
7777

7878
# Image URL to use all building/pushing image targets
7979
IMG ?= ${IMAGE_TAG_BASE}:${VERSION}
80+
81+
# IMAGE_BUILD_FLAGS are the flags passed to the podman operator image build command
82+
IMAGE_BUILD_FLAGS :=
83+
8084
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
8185
ENVTEST_K8S_VERSION = 1.24.2
8286

@@ -184,7 +188,7 @@ run: manifests fmt vet ## Run a controller from your host.
184188

185189
.PHONY: image-build
186190
image-build: test-unit ## Build container image with the manager.
187-
podman build -t ${IMG} .
191+
podman $(IMAGE_BUILD_FLAGS) build -t ${IMG} .
188192

189193
.PHONY: image-push
190194
image-push: image-build ## Push container image with the manager.

0 commit comments

Comments
 (0)