Skip to content

Commit 2085697

Browse files
adrianreberclaude
andcommitted
feat: enhance OpenEuler support and update repository configurations
Improve test infrastructure compatibility with OpenEuler distributions and update repository configurations for better CI reliability. Changes: - Generalize OpenEuler version support from specific 22.03 to wildcard pattern for broader compatibility - Add OpenEuler-specific repository configuration fixes including metalink disabling and baseurl corrections - Configure SELinux disabled for OpenEuler nodes via warewulf - Switch OpenChami provisioner to use Factory repositories for EL_10 - Add policycoreutils-python-utils package to kickstart for SELinux management utilities These changes improve distribution compatibility and CI reliability across different OpenEuler versions and provisioning scenarios. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Adrian Reber <areber@redhat.com>
1 parent 966d919 commit 2085697

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

ansible/roles/test/files/support_functions.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ EOF
228228
echo "export UCX_NET_DEVICES=eth3"
229229
} >>/tmp/user_integration_tests
230230
fi
231-
if [[ ${CI_CLUSTER} == "huawei" ]] && [[ "${DISTRIBUTION}" == "openEuler_22.03" ]]; then
231+
if [[ ${CI_CLUSTER} == "huawei" ]] && [[ "${DISTRIBUTION}" == "openEuler"* ]]; then
232232
echo "export UCX_NET_DEVICES=eth0,eth2" >>/tmp/user_integration_tests
233233
elif [[ ${CI_CLUSTER} == "huawei" ]]; then
234234
echo "export UCX_NET_DEVICES=enp125s0f0" >>/tmp/user_integration_tests
@@ -309,6 +309,12 @@ install_openHPC_cluster() {
309309
sed '/export CHROOT/a /usr/bin/cp -vf /etc/yum.repos.d/BaseOS*repo $CHROOT/etc/yum.repos.d' -i "${recipeFile}"
310310
# shellcheck disable=SC2016
311311
sed '/export CHROOT/a /usr/bin/cp -vf /etc/yum.repos.d/AppStream*repo $CHROOT/etc/yum.repos.d' -i "${recipeFile}"
312+
if [[ "${DISTRIBUTION}" == "openEuler"* ]]; then
313+
sed "/export CHROOT/a sed -i 's,\\\(metalink\\\),#\\\1,g' \$CHROOT/etc/yum.repos.d/openEuler.repo" -i "${recipeFile}"
314+
sed "/export CHROOT/a sed -i 's,\\\(baseurl=http\\\)s,\\\1,g' \$CHROOT/etc/yum.repos.d/openEuler.epo" -i "${recipeFile}"
315+
# shellcheck disable=SC2016
316+
sed '/export CHROOT/a wwctl profile set --yes nodes -A "selinux=0"' -i "${recipeFile}"
317+
fi
312318
fi
313319
elif [[ $CI_CLUSTER == "lenovo" ]]; then
314320
echo "CI Customization: PXE boot selection is not persistent"
@@ -330,6 +336,11 @@ install_openHPC_cluster() {
330336
if [ "${Provisioner}" == "openchami" ]; then
331337
echo "CI Customization: Switch to http in repository definition"
332338
sed -e "s,https://dl,http://dl,g" -i "${recipeFile}"
339+
# Switch host to Factory
340+
sed -e '/ohpc-release/ s,dnf -y install.*ohpc-release.*rpm,dnf config-manager --add-repo http://obs.openhpc.community:82/OpenHPC4:/4.0:/Factory/EL_10/,g' -i "${recipeFile}"
341+
# Switch client to Factory
342+
sed -e '/ohpc-release/d' -i "${recipeFile}"
343+
sed -e 's,\(cmd: dnf config-manager --set-enabled crb\),\1 ; dnf config-manager --add-repo http://obs.openhpc.community:82/OpenHPC4:/4.0:/Factory/EL_10/; echo "user_agent=curl" >> /etc/dnf/dnf.conf,g' -i "${recipeFile}"
333344
fi
334345
if [ "${Provisioner}" == "warewulf4" ]; then
335346
echo "CI Customization: Switch to http in repository definition"

ansible/roles/test/templates/el-kickstart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ text
4343
ipmitool
4444
-firewalld
4545
openssl-devel
46+
policycoreutils-python-utils
4647

4748
{% if type == 'el' %}
4849
python3-pip

0 commit comments

Comments
 (0)