Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

e2e: fix nodename in nodes #319

Merged
merged 1 commit into from
Jan 20, 2024
Merged

e2e: fix nodename in nodes #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions tests/e2e/lib/container
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,23 @@ setup_node() {
if_error_exit "failed to sed ContainerFile node template!"
}

set_nodename_all_nodes() {
for nodeID in $(seq 1 "${NUMBER_OF_NODES}") ;
do
eval "$(podman exec node"${nodeID}" \
sed -i 's/^#NodeName=/NodeName='node"${nodeID}"'/g' \
/etc/bluechi/agent.conf.d/agent.conf
)"
if_error_exit "node: unable to sed NodeName in bluechi agent.conf"

# restarting the qm bluechi-agent
eval "$(podman exec node"${nodeID}" \
systemctl restart bluechi-agent
)"
if_error_exit "node: unable to restart bluechi-agent service"
done
}

qm_set_nodename_all_nodes() {
for nodeID in $(seq 1 "${NUMBER_OF_NODES}") ;
do
Expand Down Expand Up @@ -137,8 +154,7 @@ create_qm_node() {

# Enable bluechi-agent
echo 'RUN cp /usr/share/bluechi-agent/config/*.conf /etc/bluechi/agent.conf.d/' >> ContainerFile.node"${nodeID}"
echo 'RUN sed -i -e "s/^#NodeName=/NodeName='"node${nodeID}/"\" \
'-e "s/^#ControllerHost=/ControllerHost='"${IP_CONTROL_MACHINE}/"\" \
echo 'RUN sed -i -e "s/^#ControllerHost=/ControllerHost='"${IP_CONTROL_MACHINE}/"\" \
' /etc/bluechi/agent.conf.d/agent.conf' >> ContainerFile.node"${nodeID}"
echo "RUN systemctl enable bluechi-agent &> /dev/null" >> ContainerFile.node"${nodeID}"

Expand Down
1 change: 1 addition & 0 deletions tests/e2e/run-test-e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ for ((i=1;i<=NUMBER_OF_NODES;i++)); do
echo
done

set_nodename_all_nodes
qm_set_nodename_all_nodes

# Tests
Expand Down