From 5bf0e3d0687c2461134dae839fd13b80fa1d5b77 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Thu, 7 Nov 2024 01:30:04 -0300 Subject: [PATCH] test reset+reinstall with actual build, not previous k0s --- e2e/install_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/install_test.go b/e2e/install_test.go index 06a3905cd..083835fdc 100644 --- a/e2e/install_test.go +++ b/e2e/install_test.go @@ -775,7 +775,7 @@ func TestResetAndReinstallAirgap(t *testing.T) { t.Logf("%s: downloading airgap file", time.Now().Format(time.RFC3339)) airgapBundlePath := "/tmp/airgap-bundle.tar.gz" - err := downloadAirgapBundle(t, fmt.Sprintf("appver-%s-previous-k0s", os.Getenv("SHORT_SHA")), airgapBundlePath, os.Getenv("AIRGAP_LICENSE_ID")) + err := downloadAirgapBundle(t, fmt.Sprintf("appver-%s", os.Getenv("SHORT_SHA")), airgapBundlePath, os.Getenv("AIRGAP_LICENSE_ID")) if err != nil { t.Fatal(err) } @@ -812,7 +812,7 @@ func TestResetAndReinstallAirgap(t *testing.T) { } t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339)) - line = []string{"check-airgap-installation-state.sh", fmt.Sprintf("appver-%s-previous-k0s", os.Getenv("SHORT_SHA")), k8sVersionPrevious()} + line = []string{"check-airgap-installation-state.sh", fmt.Sprintf("appver-%s-previous-k0s", os.Getenv("SHORT_SHA")), k8sVersion()} if _, _, err := tc.RunCommandOnNode(0, line); err != nil { t.Fatalf("fail to check installation state: %v", err) } @@ -837,7 +837,7 @@ func TestResetAndReinstallAirgap(t *testing.T) { } t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339)) - line = []string{"check-airgap-installation-state.sh", fmt.Sprintf("appver-%s-previous-k0s", os.Getenv("SHORT_SHA")), k8sVersionPrevious()} + line = []string{"check-airgap-installation-state.sh", fmt.Sprintf("appver-%s-previous-k0s", os.Getenv("SHORT_SHA")), k8sVersion()} if _, _, err := tc.RunCommandOnNode(0, line); err != nil { t.Fatalf("fail to check installation state: %v", err) }