From 270c3c74e50529a9a5f69e4ab5567864120c4a63 Mon Sep 17 00:00:00 2001
From: Tyler Gillson <tyler.gillson@gmail.com>
Date: Tue, 17 Sep 2024 18:26:40 -0400
Subject: [PATCH] test: add twoNode flag, tidy deploy func

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
---
 test/test-two-node.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/test-two-node.sh b/test/test-two-node.sh
index 9e40eaf..dc58815 100755
--- a/test/test-two-node.sh
+++ b/test/test-two-node.sh
@@ -83,6 +83,8 @@ stylus:
   users:
   - name: kairos
     passwd: kairos
+  twoNode:
+    enable: true
   site:
     edgeHostToken: "$EDGE_REGISTRATION_TOKEN"
     paletteEndpoint: "$DOMAIN"
@@ -520,7 +522,9 @@ function clean_all() {
 # Builds 2-node provider image and ISO, uploads the ISO to vCenter, and provisions edge hosts
 # for deploying a 2-node cluster.
 function deploy() {
-    earthly +build-all-images \
+    set +e
+
+    earthly --push +build-all-images \
         --ARCH=amd64 \
         --ISO_NAME=palette-edge-installer-stylus-k3s-twonode \
         --IMAGE_REGISTRY=${OCI_REGISTRY} \
@@ -528,8 +532,6 @@ function deploy() {
         --TWO_NODE_BACKEND=${TWO_NODE_BACKEND} \
         --CUSTOM_TAG=twonode
 
-    docker push ${OCI_REGISTRY}/ubuntu:k3s-${K8S_VERSION}-v${PE_VERSION}-twonode
-
     # create & upload user-data ISOs, configured to enable two node mode
     create_userdata_iso
     upload_userdata_iso
@@ -538,12 +540,13 @@ function deploy() {
     iso=palette-edge-installer-stylus-k3s-twonode.iso
     govc datastore.upload --ds=$GOVC_DATASTORE --dc=$GOVC_DATACENTER build/$iso $STYLUS_ISO
 
-    vm_array=("two-node-jul8-1" "two-node-jul8-2")
+    vm_array=("two-node-sep16-1" "two-node-sep16-2")
     create_vms
     wait_for_vms_to_power_off
     reboot_vms
 
     echo Edge hosts should register with Palette shortly. Please proceed to deploying an Edge cluster via the UI.
+    set -e
 }
 
 function main() {