Skip to content

Commit e0c2bd5

Browse files
authored
Merge pull request #42 from openhpc/2025-09-18-29
fix: improve test infrastructure reliability and configuration
2 parents 7ff0f35 + 225e549 commit e0c2bd5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ansible/roles/test/files/support_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ wait_for_computes() {
630630

631631
for i in $(seq 90 -1 1); do
632632
echo "Waiting for compute nodes to get ready ($i)"
633-
if ! "${CHECK_COMMAND[@]}" | grep -E '(down|refused|booting|route|closed|disconnect|authenticity)'; then
633+
if ! "${CHECK_COMMAND[@]}" | grep -E '(down|password|refused|booting|route|closed|disconnect|authenticity)'; then
634634
echo "All compute nodes are ready"
635635
not_ready=0
636636
break

ansible/roles/test/templates/el-kickstart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{%- endif -%}
3131
{%- set base = 'openEuler-'~release~'-LTS-'~SP~'-everything/' -%}
3232
{%- if inventory_hostname_short.startswith('ohpc-lenovo-repo') -%}
33-
{%- set mirror1_base = 'http://TODO.mirrors.nxthost.com/rocky/'~release~'/' -%}
33+
{%- set mirror1_base = 'http://ftp.agdsn.de/openeuler/openEuler-'~release~'-LTS-'~SP~'/' -%}
3434
{%- elif inventory_hostname_short.startswith('ohpc-huawei-repo') -%}
3535
{%- set mirror1_base = 'http://mirrors.nju.edu.cn/openeuler/openEuler-'~release~'-LTS-'~SP~'/' -%}
3636
{%- endif -%}
@@ -155,7 +155,8 @@ export http_proxy=http://{{ proxy }}
155155
echo "gpgcheck=0" >> /etc/yum.repos.d/DVD.repo
156156
echo "gpgcheck=0" >> /etc/yum.repos.d/everythingMirror.repo
157157
echo "gpgcheck=0" >> /etc/yum.repos.d/updateMirror.repo
158-
sed -i "s,metalink,#metalink,g" -i /etc/yum.repos.d/openEuler.repo
158+
sed -i "s,\(metalink\),#\1,g" -i /etc/yum.repos.d/openEuler.repo
159+
sed -e "s,\(baseurl=http\)s,\1,g" -i /etc/yum.repos.d/openEuler.repo
159160
sed '/Banner/d;/AllowTcpForwarding/d;/AllowAgentForwarding/d;/GatewayPorts/d;/PermitTunnel/d;' -i /etc/ssh/sshd_config
160161
sed 's,/usr/libexec/openssh/openssh/sftp-server,/usr/libexec/openssh/sftp-server,g;' -i /etc/ssh/sshd_config
161162
{% if inventory_hostname_short.startswith('ohpc-huawei-repo') %}

0 commit comments

Comments
 (0)