Skip to content

Commit 070b4ba

Browse files
committed
Run tests on RHEL 8 & 9
1 parent b652219 commit 070b4ba

File tree

3 files changed

+36
-3
lines changed

3 files changed

+36
-3
lines changed

.github/workflows/test.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ jobs:
126126
echo Some tests failed;
127127
exit 1;
128128
fi
129+
env:
130+
REDHAT_ORG: ${{ secrets.REDHAT_ORG }}
131+
REDHAT_ACTIVATION_KEY_RHEL7: ${{ secrets.REDHAT_ACTIVATION_KEY_RHEL7 }}
132+
REDHAT_ACTIVATION_KEY_RHEL8: ${{ secrets.REDHAT_ACTIVATION_KEY_RHEL8 }}
133+
REDHAT_ACTIVATION_KEY_RHEL9: ${{ secrets.REDHAT_ACTIVATION_KEY_RHEL9 }}
129134

130135
linux-build-aarch64:
131136
if: ${{ github.event.inputs.inplinuxaarch64 == 'yes' }}
@@ -212,6 +217,10 @@ jobs:
212217
fi
213218
env:
214219
DOCKER_DEFAULT_PLATFORM: "linux/arm64"
220+
REDHAT_ORG: ${{ secrets.REDHAT_ORG }}
221+
REDHAT_ACTIVATION_KEY_RHEL7: ${{ secrets.REDHAT_ACTIVATION_KEY_RHEL7 }}
222+
REDHAT_ACTIVATION_KEY_RHEL8: ${{ secrets.REDHAT_ACTIVATION_KEY_RHEL8 }}
223+
REDHAT_ACTIVATION_KEY_RHEL9: ${{ secrets.REDHAT_ACTIVATION_KEY_RHEL9 }}
215224

216225
macos:
217226
if: ${{ github.event.inputs.inpmacos == '' || github.event.inputs.inpmacos == 'yes' }}

Makefile

+9-3
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,30 @@ linux-in-docker:
9292
-e LOCAL_UID=`id -u` -e LOCAL_GID=`id -g` \
9393
rlib/rig-builder:latest make linux
9494

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
9696
print-linux-variants:
9797
@echo $(VARIANTS)
9898
print-linux-variants-json:
9999
@echo $(VARIANTS) | sed 's/ /","/g' | sed 's/^/["/' | sed 's/$$/"]/'
100100

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)
101107
define GEN_TESTS
102108
linux-test-$(variant):
103109
mkdir -p tests/results
104110
rm -f tests/results/`echo $(variant) | tr / -`.fail \
105111
tests/results/`echo $(variant) | tr / -`.success
106112
docker run -t --rm $(DOCKER_ARCH) --privileged \
107-
-v $(PWD):/work `echo $(variant) | tr - :` \
113+
-v $(PWD):/work $(ENVS) `echo $(variant) | tr - :` \
108114
bash -c /work/tests/test-linux-docker.sh && \
109115
touch tests/results/`echo $(variant) | tr / -`.success || \
110116
touch tests/results/`echo $(variant) | tr / -`.fail
111117
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
113119
.PHONY: linux-test-$(variant) shell-$(variant)
114120
TEST_IMAGES += linux-test-$(variant)
115121
endef

tests/test-linux-docker.sh

+18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11

2+
set -e
3+
source /etc/os-release
4+
if [[ "$ID" == "rhel" ]]; then
5+
if [[ "$VERSION_ID" =~ ^7 ]]; then
6+
REDHAT_ORG=${REDHAT_ORG_RHEL7}
7+
REDHAT_ACTIVATION_KEY=${REDHAT_ACTIVATION_KEY_RHEL7}
8+
elif [[ "$VERSION_ID" =~ ^8 ]]; then
9+
REDHAT_ORG=${REDHAT_ORG_RHEL8}
10+
REDHAT_ACTIVATION_KEY=${REDHAT_ACTIVATION_KEY_RHEL8}
11+
elif [[ "$VERSION_ID" =~ ^9 ]]; then
12+
REDHAT_ORG=${REDHAT_ORG_RHEL9}
13+
REDHAT_ACTIVATION_KEY=${REDHAT_ACTIVATION_KEY_RHEL9}
14+
fi
15+
trap "subscription-manager unregister" EXIT
16+
subscription-manager register --org ${REDHAT_ORG} \
17+
--activationkey ${REDHAT_ACTIVATION_KEY}
18+
fi
19+
220
cd /work
321

422
PATH=/work/tests/bats/bin:$PATH

0 commit comments

Comments
 (0)