Merge remote-tracking branch 'origin/main' into k0s-1-29

Author: laverya

.github/workflows/release-prod.yaml

@@ -306,20 +306,20 @@ jobs:
           ./scripts/ci-release-app.sh
           
           # then install a version with alternate unsupported overrides
-          export EC_VERSION="$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')"
-          export APP_VERSION="appver-${SHORT_SHA}-unsupported-overrides"
+          export EC_VERSION="${{ github.ref_name }}"
+          export APP_VERSION="appver-${{ github.ref_name }}-unsupported-overrides"
           export RELEASE_YAML_DIR=e2e/kots-release-unsupported-overrides
           ./scripts/ci-release-app.sh
           
           # then install a version with additional failing host preflights
-          export EC_VERSION="$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')"
-          export APP_VERSION="appver-${SHORT_SHA}-failing-preflights"
+          export EC_VERSION="${{ github.ref_name }}"
+          export APP_VERSION="appver-${{ github.ref_name }}-failing-preflights"
           export RELEASE_YAML_DIR=e2e/kots-release-install-failing-preflights
           ./scripts/ci-release-app.sh
           
           # then install a version with additional warning host preflights
-          export EC_VERSION="$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')"
-          export APP_VERSION="appver-${SHORT_SHA}-warning-preflights"
+          export EC_VERSION="${{ github.ref_name }}"
+          export APP_VERSION="appver-${{ github.ref_name }}-warning-preflights"
           export RELEASE_YAML_DIR=e2e/kots-release-install-warning-preflights
           ./scripts/ci-release-app.sh
 
@@ -474,7 +474,6 @@ jobs:
           - TestSingleNodeUpgradePreviousStable
           - TestInstallFromReplicatedApp
           - TestUpgradeFromReplicatedApp
-          - TestInstallWithoutEmbed
 #          - TestUpgradeEC18FromReplicatedApp
           - TestResetAndReinstall
 #          - TestOldVersionUpgrade

e2e/install_test.go

@@ -434,29 +434,6 @@ func TestMultiNodeInstallation(t *testing.T) {
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
 
-func TestInstallWithoutEmbed(t *testing.T) {
-	t.Parallel()
-
-	RequireEnvVars(t, []string{"SHORT_SHA"})
-
-	tc := docker.NewCluster(&docker.ClusterInput{
-		T:            t,
-		Nodes:        1,
-		Distro:       "debian-bookworm",
-		LicensePath:  "license.yaml",
-		ECBinaryPath: "../output/bin/embedded-cluster-original",
-	})
-	defer tc.Cleanup()
-
-	t.Logf("%s: installing embedded-cluster on node 0", time.Now().Format(time.RFC3339))
-	line := []string{"default-install.sh"}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to install embedded-cluster on node 0: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
-}
-
 func TestInstallFromReplicatedApp(t *testing.T) {
 	t.Parallel()