Skip to content

Commit 3e6aa4a

Browse files
committed
Remove workaround for IIC-427
We should no longer have to run this script manually Signed-off-by: Salvatore Daniele <[email protected]>
1 parent 9a8167e commit 3e6aa4a

File tree

1 file changed

+4
-25
lines changed

1 file changed

+4
-25
lines changed

ipu.py

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ def _boot_iso(self, iso: str) -> None:
5858
logger.info(f"Redfish boot triggered, attempting to connect to ACC at ip {self.config.ip}")
5959
# wait on install + reboot to complete
6060
acc = host.RemoteHost(self.config.ip)
61-
# WA since we can't reliably expect the acc to get a dhcp lease due to https://issues.redhat.com/browse/IIC-427
62-
self._wait_for_acc_with_retry(acc=acc)
63-
# configure_iso_network_port(self.network_api_port, self.config.ip)
61+
62+
acc.ssh_connect("root", "redhat")
63+
logger.info(acc.run("uname -a"))
64+
logger.info("Connected to ACC")
6465

6566
def _wait_for_acc_with_retry(self, acc: host.Host, timeout: int = 1200) -> None:
6667
# Typically if the acc booted properly it will take < 20 minutes to come up (including the 10 min sleep we do during boot)
@@ -178,24 +179,6 @@ def _prepare_imc(self, server_with_key: str) -> None:
178179
update-ca-trust
179180
sleep 10 # wait for ip address so that redfish starts with that in place
180181
systemctl restart redfish
181-
# workaround to ensure acc has connectivity https://issues.redhat.com/browse/IIC-266
182-
nohup sh -c '
183-
while true; do
184-
if [ -f /work/scripts/ipu_port1_setup.sh ]; then
185-
count=0
186-
while [ $count -lt 20 ]; do
187-
/work/scripts/ipu_port1_setup.sh
188-
count=$((count + 1))
189-
sleep $count
190-
done
191-
break
192-
else
193-
break
194-
fi
195-
done
196-
' &
197-
198-
199182
"""
200183
server = host.RemoteHost(server_with_key)
201184
server.ssh_connect("root", "redhat")
@@ -225,10 +208,6 @@ def _prepare_imc(self, server_with_key: str) -> None:
225208
imc.run("cp /etc/imc-redfish-configuration.json /work/redfish/")
226209
imc.run(f"echo {self.password} | bash /usr/bin/ipu-redfish-generate-password-hash.sh")
227210

228-
# WA: We need to manually install this file to enable networking with the fxp-net_linux-networking.pkg
229-
imc.copy_to("./manifests/dpu/ipu_port1_setup.sh", "/work/scripts/ipu_port1_setup.sh")
230-
imc.run("chmod +x /work/scripts/ipu_port1_setup.sh")
231-
232211
imc.run("reboot")
233212
time.sleep(10)
234213
imc.wait_ping()

0 commit comments

Comments
 (0)