@@ -92,24 +92,30 @@ linux-in-docker:
92
92
-e LOCAL_UID=` id -u` -e LOCAL_GID=` id -g` \
93
93
rlib/rig-builder:latest make linux
94
94
95
- VARIANTS = ubuntu-20.04 ubuntu-22.04 ubuntu-24.04 debian-11 debian-12 rockylinux-8 rockylinux-9 opensuse/leap-15.5 opensuse/leap-15.6 fedora-39 fedora-40 almalinux-8 almalinux-9
95
+ VARIANTS = ubuntu-20.04 ubuntu-22.04 ubuntu-24.04 debian-11 debian-12 rockylinux-8 rockylinux-9 opensuse/leap-15.5 opensuse/leap-15.6 fedora-39 fedora-40 almalinux-8 almalinux-9 redhat/ubi8 redhat/ubi9
96
96
print-linux-variants :
97
97
@echo $(VARIANTS )
98
98
print-linux-variants-json :
99
99
@echo $(VARIANTS ) | sed ' s/ /","/g' | sed ' s/^/["/' | sed ' s/$$/"]/'
100
100
101
+ ENVS = -e REDHAT_ORG_RHEL7=$(REDHAT_ORG ) \
102
+ -e REDHAT_ORG_RHEL8=$(REDHAT_ORG ) \
103
+ -e REDHAT_ORG_RHEL9=$(REDHAT_ORG ) \
104
+ -e REDHAT_ACTIVATION_KEY_RHEL7=$(REDHAT_ACTIVATION_KEY_RHEL7 ) \
105
+ -e REDHAT_ACTIVATION_KEY_RHEL8=$(REDHAT_ACTIVATION_KEY_RHEL8 ) \
106
+ -e REDHAT_ACTIVATION_KEY_RHEL9=$(REDHAT_ACTIVATION_KEY_RHEL9 )
101
107
define GEN_TESTS
102
108
linux-test-$(variant ) :
103
109
mkdir -p tests/results
104
110
rm -f tests/results/`echo $(variant ) | tr / -`.fail \
105
111
tests/results/`echo $(variant ) | tr / -`.success
106
112
docker run -t --rm $(DOCKER_ARCH ) --privileged \
107
- -v $(PWD ) :/work `echo $(variant ) | tr - :` \
113
+ -v $(PWD ) :/work $( ENVS ) `echo $(variant ) | tr - :` \
108
114
bash -c /work/tests/test-linux-docker.sh && \
109
115
touch tests/results/`echo $(variant ) | tr / -`.success || \
110
116
touch tests/results/`echo $(variant ) | tr / -`.fail
111
117
shell-$(variant ) :
112
- docker run -ti --rm -v $(PWD ) :/work `echo $(variant ) | tr - :` bash
118
+ docker run -ti --rm -v $(PWD ) :/work $( ENVS ) `echo $(variant ) | tr - :` bash
113
119
.PHONY: linux-test-$(variant ) shell-$(variant )
114
120
TEST_IMAGES += linux-test-$(variant )
115
121
endef
0 commit comments