Skip to content

Commit a403220

Browse files
dimsdims
committed
Better fix for post merge failure of container-build-test
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 81a21c1 commit a403220

File tree

4 files changed

+33
-14
lines changed

4 files changed

+33
-14
lines changed

‎common.mk‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@ SAFE_REF_NAME := $(if $(SAFE_REF_NAME),$(SAFE_REF_NAME),local)
2929
BUILDX_BUILDER ?= nvsentinel-builder
3030
PLATFORMS ?= linux/arm64,linux/amd64
3131

32-
# Cache configuration (can be disabled via environment variables)
33-
DISABLE_REGISTRY_CACHE ?= false
34-
CACHE_FROM_ARG := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME))
35-
CACHE_TO_ARG := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME),mode=max)
36-
3732
# Auto-detect current module name from directory
3833
MODULE_NAME := $(shell basename $(CURDIR))
3934

35+
# Cache configuration (can be disabled via environment variables)
36+
DISABLE_REGISTRY_CACHE ?= false
37+
ifeq ($(DISABLE_REGISTRY_CACHE),true)
38+
CACHE_FROM_ARG :=
39+
CACHE_TO_ARG :=
40+
else
41+
CACHE_FROM_ARG := --cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)
42+
CACHE_TO_ARG := --cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME),mode=max
43+
endif
44+
4045
# Repository root path calculation (works from any subdirectory depth)
4146
REPO_ROOT := $(shell git rev-parse --show-toplevel)
4247

‎health-monitors/gpu-health-monitor/Makefile‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,17 @@ LINT_EXTRA_FLAGS :=
4242
include ../../common.mk
4343

4444
# Cache configuration for specialized builds (respect DISABLE_REGISTRY_CACHE)
45-
CACHE_FROM_ARG_DCGM3 := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-3)
46-
CACHE_TO_ARG_DCGM3 := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-3,mode=max)
47-
CACHE_FROM_ARG_DCGM4 := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-4)
48-
CACHE_TO_ARG_DCGM4 := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-4,mode=max)
45+
ifeq ($(DISABLE_REGISTRY_CACHE),true)
46+
CACHE_FROM_ARG_DCGM3 :=
47+
CACHE_TO_ARG_DCGM3 :=
48+
CACHE_FROM_ARG_DCGM4 :=
49+
CACHE_TO_ARG_DCGM4 :=
50+
else
51+
CACHE_FROM_ARG_DCGM3 := --cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-3
52+
CACHE_TO_ARG_DCGM3 := --cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-3,mode=max
53+
CACHE_FROM_ARG_DCGM4 := --cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-4
54+
CACHE_TO_ARG_DCGM4 := --cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:$(MODULE_NAME)-4,mode=max
55+
endif
4956

5057
# =============================================================================
5158
# DEFAULT TARGET

‎node-drainer-module/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ docker-build-with-cache: setup-buildx
5858
$(DOCKER_EXTRA_ARGS) \
5959
--load \
6060
-t $(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-$(MODULE_NAME):$(SAFE_REF_NAME) \
61-
-f $(MODULE_NAME)/Dockerfile \
61+
-f $(DOCKER_MODULE_PATH)/Dockerfile \
6262
.
6363

6464
# =============================================================================

‎nvsentinel-log-collector/Makefile‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,17 @@ PLATFORMS ?= linux/arm64,linux/amd64
1212

1313
# Cache configuration (can be disabled via environment variables)
1414
DISABLE_REGISTRY_CACHE ?= false
15-
CACHE_FROM_ARG_LOG := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:log-collector)
16-
CACHE_TO_ARG_LOG := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:log-collector,mode=max)
17-
CACHE_FROM_ARG_CLEANUP := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:file-server-cleanup)
18-
CACHE_TO_ARG_CLEANUP := $(if $(filter true,$(DISABLE_REGISTRY_CACHE)),,--cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:file-server-cleanup,mode=max)
15+
ifeq ($(DISABLE_REGISTRY_CACHE),true)
16+
CACHE_FROM_ARG_LOG :=
17+
CACHE_TO_ARG_LOG :=
18+
CACHE_FROM_ARG_CLEANUP :=
19+
CACHE_TO_ARG_CLEANUP :=
20+
else
21+
CACHE_FROM_ARG_LOG := --cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:log-collector
22+
CACHE_TO_ARG_LOG := --cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:log-collector,mode=max
23+
CACHE_FROM_ARG_CLEANUP := --cache-from=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:file-server-cleanup
24+
CACHE_TO_ARG_CLEANUP := --cache-to=type=registry,ref=$(NVCR_CONTAINER_REPO)/$(NGC_ORG)/nvsentinel-buildcache:file-server-cleanup,mode=max
25+
endif
1926

2027
# Default target
2128
.PHONY: all

0 commit comments

Comments
 (0)