Extracted standalone-upgrade group

elastic · Dec 17, 2024 · 89fd608 · 89fd608
1 parent a8df411
commit 89fd608
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml
@@ -40,7 +40,9 @@ steps:
         matrix:
           - default
           - fleet
+          - fleet-endpoint-security
           - fleet-privileged
+          - standalone-upgrade
           - upgrade
           - install-uninstall
 
@@ -90,16 +92,18 @@ steps:
           image: "family/platform-ingest-elastic-agent-ubuntu-2404"
         matrix:
           - default
+          - standalone-upgrade
           - install-uninstall
           - container
-          - fleet-upgrade-to-pr-build
           - upgrade
           - fleet
-          - fqdn
-          - deb
+          - fleet-endpoint-security
           - fleet-airgapped
-          - fleet-privileged
           - fleet-airgapped-privileged
+          - fleet-privileged
+          - fleet-upgrade-to-pr-build
+          - fqdn
+          - deb
 
       - label: "arm:sudo: {{matrix}}"
         skip: true
@@ -115,16 +119,18 @@ steps:
           instanceType: "m6g.2xlarge"
         matrix:
           - default
+          - standalone-upgrade
           - install-uninstall
           - container
           - fleet-upgrade-to-pr-build
           - upgrade
           - fleet
-          - fqdn
-          - deb
+          - fleet-endpoint-security
           - fleet-airgapped
           - fleet-privileged
           - fleet-airgapped-privileged
+          - fqdn
+          - deb
 
       - label: "arm:non-sudo: {{matrix}}"
         skip: true

diff --git a/testing/integration/endpoint_security_test.go b/testing/integration/endpoint_security_test.go
@@ -69,7 +69,7 @@ var protectionTests = []struct {
 // test automatically.
 func TestInstallAndCLIUninstallWithEndpointSecurity(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -96,7 +96,7 @@ func TestInstallAndCLIUninstallWithEndpointSecurity(t *testing.T) {
 // but at this point endpoint is already uninstalled.
 func TestInstallAndUnenrollWithEndpointSecurity(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -124,7 +124,7 @@ func TestInstallAndUnenrollWithEndpointSecurity(t *testing.T) {
 // but at this point endpoint should be already uninstalled.
 func TestInstallWithEndpointSecurityAndRemoveEndpointIntegration(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -399,7 +399,7 @@ type agentPolicyUpdateRequest struct {
 // path other than default
 func TestEndpointSecurityNonDefaultBasePath(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -470,7 +470,7 @@ func TestEndpointSecurityNonDefaultBasePath(t *testing.T) {
 // Tests that install of Elastic Defend fails if Agent is installed unprivileged.
 func TestEndpointSecurityUnprivileged(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -550,7 +550,7 @@ func TestEndpointSecurityUnprivileged(t *testing.T) {
 // Tests that trying to switch from privileged to unprivileged with Elastic Defend fails.
 func TestEndpointSecurityCannotSwitchToUnprivileged(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -620,7 +620,7 @@ func TestEndpointSecurityCannotSwitchToUnprivileged(t *testing.T) {
 // TestEndpointLogsAreCollectedInDiagnostics tests that diagnostics archive contain endpoint logs
 func TestEndpointLogsAreCollectedInDiagnostics(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -838,7 +838,7 @@ func agentIsHealthyNoEndpoint(t *testing.T, ctx context.Context, agentClient cli
 // when an installed agent is running a policy with tamper protection enabled fails.
 func TestForceInstallOverProtectedPolicy(t *testing.T) {
 	info := define.Require(t, define.Requirements{
-		Group: Fleet,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
@@ -904,7 +904,7 @@ func TestForceInstallOverProtectedPolicy(t *testing.T) {
 
 func TestInstallDefendWithMTLSandEncCertKey(t *testing.T) {
 	stack := define.Require(t, define.Requirements{
-		Group: FleetInstallDefend,
+		Group: FleetEndpointSecurity,
 		Stack: &define.Stack{},
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation

diff --git a/testing/integration/groups_test.go b/testing/integration/groups_test.go
@@ -35,6 +35,9 @@ const (
 	// Upgrade group of tests. Used for testing upgrades.
 	Upgrade = "upgrade"
 
+	// StandaloneUpgrade group of tests. Used for TestStandaloneUpgrade.
+	StandaloneUpgrade = "standalone-upgrade"
+
 	// Deb group of tests. Used for testing .deb packages install & upgrades
 	Deb = "deb"
 
@@ -44,6 +47,6 @@ const (
 	// InstallUninstall group of tests. Used for testing repeated install & uninstall scenarios
 	InstallUninstall = "install-uninstall"
 
-	// FleetInstallDefend group of tests. Used for the long running TestInstallDefendWithMTLSandEncCertKey test.
-	FleetInstallDefend = "fleet-install-defend"
+	// FleetInstall group of tests. Used for the long running fleet-related "TestInstall..." tests.
+	FleetEndpointSecurity = "fleet-endpoint-security"
 )
diff --git a/testing/integration/upgrade_standalone_test.go b/testing/integration/upgrade_standalone_test.go
@@ -24,7 +24,7 @@ import (
 
 func TestStandaloneUpgrade(t *testing.T) {
 	define.Require(t, define.Requirements{
-		Group: Upgrade,
+		Group: StandaloneUpgrade,
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
 	})