fix: resolve conflicts

Author: pkoutsovasilis

.buildkite/scripts/buildkite-integration-tests.sh

@@ -49,20 +49,11 @@ outputXML="build/${fully_qualified_group_name}.integration.xml"
 outputJSON="build/${fully_qualified_group_name}.integration.out.json"
 
 echo "~~~ Integration tests: ${GROUP_NAME}"
-<<<<<<< HEAD
-GOTEST_ARGS=(-tags integration -test.shuffle on -test.timeout 2h0m0s)
-if [ -n "$TEST_NAME_PATTERN" ]; then
-  GOTEST_ARGS+=(-run="${TEST_NAME_PATTERN}")
-fi
-GOTEST_ARGS+=("github.com/elastic/elastic-agent/testing/integration" -v -args "-integration.groups=${GROUP_NAME}" "-integration.sudo=${TEST_SUDO}")
-
-=======
 # -test.timeout=2h0m0s is set because some tests normally take up to 45 minutes.
 # This 2-hour timeout provides enough room for future, potentially longer tests,
 # while still enforcing a reasonable upper limit on total execution time.
 # See: https://pkg.go.dev/cmd/go#hdr-Testing_flags
 GOTEST_ARGS=(-tags integration -test.shuffle on -test.timeout 2h0m0s "${TEST_PACKAGE}" -v -args "-integration.groups=${GROUP_NAME}" "-integration.sudo=${TEST_SUDO}" "-integration.fips=${FIPS:-false}")
->>>>>>> 92e139ca2 ([tests] split up serverless and resource leaks integration tests (#8396))
 set +e
 TEST_BINARY_NAME="elastic-agent" AGENT_VERSION="${AGENT_VERSION}" SNAPSHOT=true \
   gotestsum --no-color -f standard-quiet --junitfile "${outputXML}" --jsonfile "${outputJSON}" -- "${GOTEST_ARGS[@]}"

testing/integration/fleetserver_test.go

@@ -69,13 +69,9 @@ func TestInstallFleetServerBootstrap(t *testing.T) {
 	policyResp, err := info.KibanaClient.CreatePolicy(ctx, fleetPolicy())
 	require.NoError(t, err, "failed creating policy")
 	policy := policyResp.AgentPolicy
-<<<<<<< HEAD
-	_, err = tools.InstallPackageFromDefaultFile(ctx, info.KibanaClient, "fleet-server", preinstalledPackages["fleet-server"], "fleet-server.json", uuid.Must(uuid.NewV4()).String(), policy.ID)
-=======
 
 	packageFile := filepath.Join("testdata", "fleet-server.json")
 	_, err = tools.InstallPackageFromDefaultFile(ctx, info.KibanaClient, "fleet-server", PreinstalledPackages["fleet-server"], packageFile, uuid.Must(uuid.NewV4()).String(), policy.ID)
->>>>>>> 92e139ca2 ([tests] split up serverless and resource leaks integration tests (#8396))
 	require.NoError(t, err, "failed creating fleet-server integration")
 
 	t.Log("Get fleet-server service token...")

testing/integration/logs_ingestion.go

@@ -11,6 +11,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/elastic/elastic-agent/pkg/testing/tools/fleettools"
 	"net/http"
 	"net/http/httptest"
 	"net/http/httputil"
@@ -84,7 +85,7 @@ func LogIngestionFleetManaged(t *testing.T, info *define.Info) {
 
 	// 2. Install the Elastic-Agent with the policy that
 	// was just created.
-	policy, _, err := tools.InstallAgentWithPolicy(
+	policy, err := tools.InstallAgentWithPolicy(
 		ctx,
 		t,
 		installOpts,
@@ -186,8 +187,6 @@ func testMonitoringLogsAreShipped(
 			"component %s: want %s, got %s",
 			c.Name, client.Healthy, client.State(c.State))
 	}
-	agentID := status.Info.ID
-	t.Logf("Agent ID: %q", agentID)
 
 	// Stage 3: Make sure there are no errors in logs
 	t.Log("Making sure there are no error logs")
@@ -206,7 +205,6 @@ func testMonitoringLogsAreShipped(
 			"add_cloud_metadata: received error for provider digitalocean: failed with http status code 404",
 			"add_cloud_metadata: received error for provider azure: failed with http status code 404",
 			"add_cloud_metadata: received error for provider openstack: failed with http status code 404",
-			"add_cloud_metadata: received error for provider gcp: failed with http status code 404",
 			"elastic-agent-client error: rpc error: code = Canceled desc = context canceled", // can happen on restart
 			"failed to invoke rollback watcher: failed to start Upgrade Watcher",             // on debian this happens probably need to fix.
 			"falling back to IMDSv1: operation error ec2imds: getToken",                      // okay for the cloud metadata to not work
@@ -237,6 +235,16 @@ func testMonitoringLogsAreShipped(
 	require.NotZero(t, len(docs.Hits.Hits))
 
 	// Stage 4: verify logs from the monitoring components are not sent to the output
+	t.Log("Check monitoring logs")
+	hostname, err := os.Hostname()
+	if err != nil {
+		t.Fatalf("could not get hostname to filter Agent: %s", err)
+	}
+
+	agentID, err := fleettools.GetAgentIDByHostname(ctx, info.KibanaClient, policy.ID, hostname)
+	require.NoError(t, err, "could not get Agent ID by hostname")
+	t.Logf("Agent ID: %q", agentID)
+
 	// We cannot search for `component.id` because at the moment of writing
 	// this field is not mapped. There is an issue for that:
 	// https://github.com/elastic/integrations/issues/6545