f

e2e/install_test.go

@@ -1284,8 +1284,8 @@ func TestAirgapUpgradeFromEC18(t *testing.T) {
 	}
 
 	t.Logf("%s: running second airgap update", time.Now().Format(time.RFC3339))
-	line = []string{"/usr/local/bin/embedded-cluster-upgrade2", "update", "--airgap-bundle", "/assets/upgrade2/release.airgap"}
-	if _, _, err := tc.RunCommandOnNode(0, line); err != nil {
+	line = []string{"airgap-update2.sh"}
+	if _, _, err := tc.RunCommandOnNode(0, line, withEnv); err != nil {
 		t.Fatalf("fail to run airgap update: %v", err)
 	}
 	// remove the airgap bundle and binary after upgrade
@@ -1787,8 +1787,8 @@ func TestMultiNodeAirgapUpgradePreviousStable(t *testing.T) {
 	}
 
 	t.Logf("%s: running second airgap update", time.Now().Format(time.RFC3339))
-	line = []string{"/usr/local/bin/embedded-cluster-upgrade2", "update", "--airgap-bundle", "/assets/upgrade2/release.airgap"}
-	if _, _, err := tc.RunCommandOnNode(0, line); err != nil {
+	line = []string{"airgap-update2.sh"}
+	if _, _, err := tc.RunCommandOnNode(0, line, withEnv); err != nil {
 		t.Fatalf("fail to run airgap update: %v", err)
 	}
 	// remove the airgap bundle and binary after upgrade

e2e/scripts/airgap-prepare.sh

@@ -38,6 +38,35 @@ main() {
       exit 1
     fi
 
+    if [ -e /assets/ec-release-upgrade.tgz ]
+    then
+      mkdir -p upgrade
+      tar xzf /assets/ec-release-upgrade.tgz -C upgrade
+
+      mv upgrade/embedded-cluster-smoke-test-staging-app /usr/local/bin/embedded-cluster-upgrade
+      mkdir -p /assets/upgrade
+      mv upgrade/license.yaml /assets/upgrade/license.yaml
+
+      for file in upgrade/*.airgap;
+      do
+        if [ -e "$file" ]
+        then
+          mv "$file" /assets/upgrade/release.airgap
+          break
+        fi
+      done
+
+      # if there is no file at /assets/upgrade/release.airgap, this is an error
+      if [ ! -e /assets/upgrade/release.airgap ]
+      then
+        echo "No upgrade airgap file found"
+        exit 1
+      fi
+
+      # delete the ec upgrade airgap release
+      rm /assets/ec-release-upgrade.tgz
+    fi
+
     if [ -e /assets/ec-release-upgrade2.tgz ]
     then
       mkdir -p upgrade2

e2e/scripts/airgap-update2.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euox pipefail
+
+DIR=/usr/local/bin
+. $DIR/common.sh
+
+main() {
+    echo "upgrading from airgap bundle"
+    embedded-cluster-upgrade2 update --airgap-bundle /assets/upgrade2/release.airgap
+}
+
+main "$@"