From 5800e55027382c227d4e53a3b0032d38d294a7ac Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 19 Mar 2024 14:00:24 +0200 Subject: [PATCH] Rename build folder deployments Signed-off-by: Evan Lezar --- .common-ci.yml | 4 ++-- .github/workflows/image.yaml | 2 +- .gitlab-ci.yml | 2 +- .nvidia-ci.yml | 2 +- {build => deployments}/container/Dockerfile.centos | 0 {build => deployments}/container/Dockerfile.packaging | 0 {build => deployments}/container/Dockerfile.ubuntu | 0 {build => deployments}/container/Makefile | 6 +++--- {build => deployments}/container/README.md | 0 {build => deployments}/container/multi-arch.mk | 0 {build => deployments}/container/native-only.mk | 0 11 files changed, 8 insertions(+), 8 deletions(-) rename {build => deployments}/container/Dockerfile.centos (100%) rename {build => deployments}/container/Dockerfile.packaging (100%) rename {build => deployments}/container/Dockerfile.ubuntu (100%) rename {build => deployments}/container/Makefile (95%) rename {build => deployments}/container/README.md (100%) rename {build => deployments}/container/multi-arch.mk (100%) rename {build => deployments}/container/native-only.mk (100%) diff --git a/.common-ci.yml b/.common-ci.yml index 891d6966..63797c21 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -144,7 +144,7 @@ trigger-pipeline: - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}" - docker pull "${IMAGE_NAME}:${VERSION}-${DIST}" script: - - make -f build/container/Makefile test-${DIST} + - make -f deployments/container/Makefile test-${DIST} # Define the test targets test-packaging: @@ -194,7 +194,7 @@ test-packaging: # Since OUT_IMAGE_NAME and OUT_IMAGE_VERSION are set, this will push the CI image to the # Target - - make -f build/container/Makefile push-${DIST} + - make -f deployments/container/Makefile push-${DIST} # Define a staging release step that pushes an image to an internal "staging" repository # This is triggered for all pipelines (i.e. not only tags) to test the pipeline steps diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index fc402717..5b077f74 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -135,4 +135,4 @@ jobs: VERSION: ${COMMIT_SHORT_SHA} run: | echo "${VERSION}" - make -f build/container/Makefile build-${{ matrix.dist }} + make -f deployments/container/Makefile build-${{ matrix.dist }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1f8e911..f90bb629 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ package-ubuntu18.04-ppc64le: - 'echo "Logging in to CI registry ${CI_REGISTRY}"' - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}" script: - - make -f build/container/Makefile build-${DIST} + - make -f deployments/container/Makefile build-${DIST} image-ubi8: extends: diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 22af2035..54f2a1e4 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -67,7 +67,7 @@ variables: regctl manifest get ${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} --list > /dev/null && echo "${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST}" || ( echo "${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} does not exist" && sleep infinity ) script: - regctl registry login "${OUT_REGISTRY}" -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}" - - make -f build/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} OUT_IMAGE=${OUT_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}-${DIST} push-${DIST} + - make -f deployments/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} OUT_IMAGE=${OUT_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}-${DIST} push-${DIST} image-ubi8: extends: diff --git a/build/container/Dockerfile.centos b/deployments/container/Dockerfile.centos similarity index 100% rename from build/container/Dockerfile.centos rename to deployments/container/Dockerfile.centos diff --git a/build/container/Dockerfile.packaging b/deployments/container/Dockerfile.packaging similarity index 100% rename from build/container/Dockerfile.packaging rename to deployments/container/Dockerfile.packaging diff --git a/build/container/Dockerfile.ubuntu b/deployments/container/Dockerfile.ubuntu similarity index 100% rename from build/container/Dockerfile.ubuntu rename to deployments/container/Dockerfile.ubuntu diff --git a/build/container/Makefile b/deployments/container/Makefile similarity index 95% rename from build/container/Makefile rename to deployments/container/Makefile index 905459a5..6e44ccd8 100644 --- a/build/container/Makefile +++ b/deployments/container/Makefile @@ -56,9 +56,9 @@ TEST_TARGETS := $(patsubst %,test-%,$(DISTRIBUTIONS)) .PHONY: $(DISTRIBUTIONS) $(PUSH_TARGETS) $(BUILD_TARGETS) $(TEST_TARGETS) ifneq ($(BUILD_MULTI_ARCH_IMAGES),true) -include $(CURDIR)/build/container/native-only.mk +include $(CURDIR)/deployments/container/native-only.mk else -include $(CURDIR)/build/container/multi-arch.mk +include $(CURDIR)/deployments/container/multi-arch.mk endif # For the default push target we also push a short tag equal to the version. @@ -84,7 +84,7 @@ push-short: build-%: DIST = $(*) -build-%: DOCKERFILE = $(CURDIR)/build/container/Dockerfile.$(DOCKERFILE_SUFFIX) +build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SUFFIX) ARTIFACTS_ROOT ?= $(shell realpath --relative-to=$(CURDIR) $(DIST_DIR)) diff --git a/build/container/README.md b/deployments/container/README.md similarity index 100% rename from build/container/README.md rename to deployments/container/README.md diff --git a/build/container/multi-arch.mk b/deployments/container/multi-arch.mk similarity index 100% rename from build/container/multi-arch.mk rename to deployments/container/multi-arch.mk diff --git a/build/container/native-only.mk b/deployments/container/native-only.mk similarity index 100% rename from build/container/native-only.mk rename to deployments/container/native-only.mk