Skip to content

Commit 567c7f4

Browse files
committed
[no-relnote] Rename release test targets
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent eb84439 commit 567c7f4

File tree

5 files changed

+14
-39
lines changed

5 files changed

+14
-39
lines changed

tests/release/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
WORKFLOW ?= nvidia-docker
1616

17-
DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 centos8 fedora35
17+
DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 rpm
1818

1919
IMAGE_TARGETS := $(patsubst %,image-%, $(DISTRIBUTIONS))
2020
RUN_TARGETS := $(patsubst %,run-%, $(DISTRIBUTIONS))
@@ -35,8 +35,7 @@ $(IMAGE_TARGETS): image-%: $(DOCKERFILE)
3535

3636
%-ubuntu20.04: ARCH ?= amd64
3737
%-ubuntu18.04: ARCH ?= amd64
38-
%-centos8: ARCH ?= x86_64
39-
%-fedora35: ARCH ?= x86_64
38+
%-rpm: ARCH ?= x86_64
4039

4140
PLATFORM_ARGS = --platform=linux/${ARCH}
4241

@@ -45,8 +44,10 @@ PROJECT_ROOT := $(RELEASE_TEST_DIR)/../..
4544

4645
LOCAL_PACKAGE_ROOT := $(PROJECT_ROOT)/dist
4746

47+
LOCAL_REPO_ROOT ?= $(LOCAL_PACKAGE_ROOT)/$(DIST)/$(ARCH)
48+
4849
local-%: DIST = $(*)
49-
local-%: LOCAL_REPO_ARGS = -v $(LOCAL_PACKAGE_ROOT)/$(DIST)/$(ARCH):/local-repository
50+
local-%: LOCAL_REPO_ARGS = -v $(LOCAL_REPO_ROOT):/local-repository
5051
$(LOCAL_TARGETS): local-%: run-%
5152

5253
run-%: DIST = $(*)

tests/release/docker/centos8/Dockerfile

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM rockylinux:9
2+
3+
RUN yum install -y createrepo
4+
5+
COPY entrypoint.sh /
6+
COPY install_repo.sh /
7+
8+
ENTRYPOINT [ "/entrypoint.sh" ]

tests/release/docker/centos8/entrypoint.sh renamed to tests/release/docker/rpm/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ enabled=1
3232
gpgcheck=0
3333
protect=1
3434
EOL
35-
35+
3636
elif [[ -n ${TEST_REPO} ]]; then
3737
./install_repo.sh ${TEST_REPO}
3838
else
File renamed without changes.

0 commit comments

Comments
 (0)