Change test requirement order, remove extra groups

Author: michel-laterman

.buildkite/bk.fips-integration.pipeline.yml

@@ -71,12 +71,7 @@ steps:
           image: "${IMAGE_UBUNTU_X86_64_FIPS}"
           instanceType: "m5.2xlarge"
         matrix:
-          - default
-          - upgrade
-          - upgrade-flavor
-          - standalone-upgrade
-          - fleet
-          # FIPS tests don't have other groups enabled in order to save resources
+          - fleet # currently there is only a single test in the fleet group, add more tests once they have been defined
 
       - label: "fips:x86_64:sudo:{{matrix}}"
         depends_on:
@@ -97,10 +92,6 @@ steps:
           image: "${IMAGE_UBUNTU_X86_64_FIPS}"
           instanceType: "m5.2xlarge"
         matrix:
-          - default
-          - upgrade
-          - upgrade-flavor
-          - standalone-upgrade
           - fleet
 
       - label: "fips:arm64:non-sudo:{{matrix}}"
@@ -122,10 +113,6 @@ steps:
           image: "${IMAGE_UBUNTU_ARM64_FIPS}"
           instanceType: "m6g.2xlarge"
         matrix:
-          - default
-          - upgrade
-          - upgrade-flavor
-          - standalone-upgrade
           - fleet
 
       - label: "fips:arm64:sudo:{{matrix}}"
@@ -147,10 +134,6 @@ steps:
           image: "${IMAGE_UBUNTU_ARM64_FIPS}"
           instanceType: "m6g.2xlarge"
         matrix:
-          - default
-          - upgrade
-          - upgrade-flavor
-          - standalone-upgrade
           - fleet
 
   - label: ESS FIPS stack cleanup

testing/integration/fleetserver_fips_test.go

@@ -75,12 +75,13 @@ func TestFIPSAgentConnectingToFIPSFleetServerInECHFRH(t *testing.T) {
 		if item.PolicyID == cloudAgentPolicyID {
 			agentStatus = item.Status
 			agentIsFIPS = item.LocalMetadata.Elastic.Agent.FIPS
+			break
 		}
 	}
 
 	// Check that this Agent is online (i.e. healthy) and is FIPS-capable. This
 	// will prove that a FIPS-capable Agent is able to connect to a FIPS-capable
 	// Fleet Server, with both running in ECH.
-	require.Equal(t, "online", agentStatus)
 	require.Equal(t, true, agentIsFIPS)
+	require.Equal(t, "online", agentStatus)
 }