e2e: fix nodename in nodes

With recent changes all nodes generated had node1 as name. Fixes: #301 Signed-off-by: Douglas Schilling Landgraf <[email protected]>
containers · Jan 20, 2024 · 068d25d · 068d25d
1 parent 7c1e4e7
commit 068d25d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/tests/e2e/lib/container b/tests/e2e/lib/container
@@ -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
@@ -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}"
 

diff --git a/tests/e2e/run-test-e2e b/tests/e2e/run-test-e2e
@@ -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