Merge branch 'main' into k8s/fix_agent_image

Author: pkoutsovasilis

testing/integration/upgrade_gpg_test.go

@@ -8,6 +8,7 @@ package integration
 
 import (
 	"context"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -98,6 +99,10 @@ func TestStandaloneUpgradeWithGPGFallbackOneRemoteFailing(t *testing.T) {
 		Sudo:  true,  // requires Agent installation
 	})
 
+	if runtime.GOOS == "windows" {
+		t.Skip("This test is flaky on windows. See https://github.com/elastic/elastic-agent/issues/6732")
+	}
+
 	minVersion := upgradetest.Version_8_10_0_SNAPSHOT
 	currentVersion, err := version.ParseVersion(define.Version())
 	require.NoError(t, err)

testing/integration/upgrade_rollback_test.go

@@ -168,6 +168,10 @@ func TestStandaloneUpgradeRollbackOnRestarts(t *testing.T) {
 		Sudo:  true,  // requires Agent installation
 	})
 
+	if runtime.GOOS == "windows" {
+		t.Skip("This test is flaky on windows. See https://github.com/elastic/elastic-agent/issues/6733")
+	}
+
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
 

testing/integration/upgrade_standalone_retry_test.go

@@ -13,6 +13,7 @@ import (
 	"net/http"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -33,6 +34,10 @@ func TestStandaloneUpgradeRetryDownload(t *testing.T) {
 		Sudo:  true,  // requires Agent installation
 	})
 
+	if runtime.GOOS == "windows" {
+		t.Skip("This test is flaky on windows. See https://github.com/elastic/elastic-agent/issues/6731")
+	}
+
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
 

testing/integration/upgrade_standalone_same_commit_test.go

@@ -18,6 +18,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -81,6 +82,11 @@ func TestStandaloneUpgradeSameCommit(t *testing.T) {
 	})
 
 	t.Run(fmt.Sprintf("Upgrade on a repackaged version of agent %s (%s)", currentVersion, unPrivilegedString), func(t *testing.T) {
+
+		if runtime.GOOS == "windows" {
+			t.Skip("This test is flaky on windows. See https://github.com/elastic/elastic-agent/issues/6729")
+		}
+
 		ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 		defer cancel()