Skip to content

Commit 6461c65

Browse files
committed
Adjust formatting and remove motd
1 parent 8f3580b commit 6461c65

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/actions/aufn-test/run.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ fi
2020

2121
function check_lab_vm_connections() {
2222
echo "Checking VM connections..."
23-
cat ssh_list.txt
2423
while IFS= read -r line; do
2524
ip=$(echo "$line" | awk '{print $3}')
2625
name=$(echo "$line" | awk '{print $2}')
2726
password=$(echo "$line" | awk '{print $5}')
2827

29-
echo "Connecting to $name ($password) at $ip ..."
28+
echo
29+
echo "Connecting to $name at $ip ..."
3030
sshpass -p "$password" ssh -o StrictHostKeyChecking=no \
3131
"lab@${ip}" 'echo "Connected to $(hostname)"'
3232
done < ssh_list.txt
3333
}
3434

3535
function validate_lab_vms() {
36+
echo
3637
echo "Validating Lab VMs setup..."
3738
index=0
3839
rm -f failed-labs.txt
@@ -42,24 +43,26 @@ function validate_lab_vms() {
4243
name=$(echo "$line" | awk '{print $2}')
4344
password=$(echo "$line" | awk '{print $5}')
4445

46+
echo
4547
echo "Validating $name at $ip..."
4648

47-
sshpass -p "$password" ssh -o StrictHostKeyChecking=no \
49+
sshpass -p "$password" ssh -o StrictHostKeyChecking=no -T \
4850
"lab@${ip}" <<'EOF'
4951
output=$(sudo virsh list --all)
5052
echo "$output"
5153
if ! echo "$output" | grep -q 'seed.*running'; then echo "'seed' not running"; fi
5254
if ! echo "$output" | grep -q 'compute0.*shut off'; then echo "'compute0' not shut off"; fi
5355
if ! echo "$output" | grep -q 'controller0.*shut off'; then echo "'controller0' not shut off"; fi
5456
57+
echo
5558
echo "$(ssh [email protected] 'sudo docker ps')"
5659
if ! ssh [email protected] 'sudo docker ps' | grep -q bifrost_deploy; then echo "Bifrost container isn't deployed"; fi
5760
if ! tail -n 10 a-seed-from-nothing.out | grep -q 'PLAY RECAP.*failed=0'; then echo "There was an error in running 'a-seed-from-nothing'"; fi
5861
EOF
5962

6063
set +e
6164

62-
sshpass -p "$password" ssh -o StrictHostKeyChecking=no \
65+
sshpass -p "$password" ssh -o StrictHostKeyChecking=no -T \
6366
"lab@${ip}" <<'EOF'
6467
output=$(sudo virsh list --all)
6568
if ! echo "$output" | grep -q 'seed.*running'; then exit 1; fi

.github/workflows/deploy-aufn.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ jobs:
167167
run: |
168168
terraform output -raw labs > ssh_list.txt
169169
sed -i 's/"//g' ssh_list.txt
170+
echo >> ssh_list.txt
170171
171172
- name: Echo Lab VMs info
172173
run: |

0 commit comments

Comments
 (0)