Enable E2E agent tests (#3595)

* Enable E2E agent container tests
* replace deprecated testcontainers.GenericBindMountSource
* enable agent install tests
* Allow e2e tests to run in vagrant, fix e2e archive extraction

Author: michel-laterman

Makefile

@@ -367,7 +367,7 @@ e2e-docker-stop: ## - Tear down testing Elasticsearch and Kibana instances
 	@$(MAKE) int-docker-stop
 
 .PHONY: test-e2e
-test-e2e: docker-cover-e2e-binaries e2e-certs build-docker ## - Setup and run the blackbox end to end test suite
+test-e2e: docker-cover-e2e-binaries build-e2e-agent-image e2e-certs build-docker ## - Setup and run the blackbox end to end test suite
 	@mkdir -p build/e2e-cover
 	@$(MAKE) e2e-docker-start
 	@set -o pipefail; $(MAKE) test-e2e-set | tee build/test-e2e.out

README.md

@@ -125,6 +125,16 @@ pr: https://github.com/elastic/fleet-server/pull/2079
 issue: https://github.com/elastic/elastic-agent/issues/931
 ```
 
+### Vagrant
+
+A Vagrantfile is provided to get an environment capable of developing and testing fleet-server.
+In order to provision the vagrant box run:
+
+```shell
+vagrant plugin install vagrant-docker-compose
+vagrant up
+```
+
 ### Development build
 
 To compile the fleet-server in development mode set the env var `DEV=true`.

Vagrantfile

@@ -7,6 +7,14 @@ Vagrant.configure("2") do |config|
     vbox.cpus = 6
   end
 
+  # require plugin https://github.com/leighmcculloch/vagrant-docker-compose
+  # vagrant plugin install vagrant-docker-compose
+  config.vagrant.plugins = "vagrant-docker-compose"
+
+  # install docker and docker-compose
+  config.vm.provision :docker
+  config.vm.provision :docker_compose
+
     config.vm.define "fleet-dev" do |nodeconfig|
       nodeconfig.vm.box = "ubuntu/jammy64"
 
@@ -21,23 +29,15 @@ Vagrant.configure("2") do |config|
       # fleet-server needs the agent, so let's mount it all
       nodeconfig.vm.synced_folder "../", "/vagrant"
       nodeconfig.vm.provider "virtualbox" do |vb|
-        # Display the VirtualBox GUI when booting the machine
         vb.gui = false
-        vb.customize ["modifyvm", :id, "--vram", "128"]
-        # Customize the amount of memory on the VM:
-        vb.memory = "2048"
+        vb.memory = 8192
+        vb.cpus = 2
+        vb.customize ["modifyvm", :id, "--ioapic", "on"]
       end
-      $user_script = <<-SCRIPT
-        GOPATH=$(go env GOPATH) # use Go's default
-        mkdir -p $GOPATH/src/github.com/magefile
-        cd $GOPATH/src/github.com/magefile
-        git clone https://github.com/magefile/mage.git
-        cd $GOPATH/src/github.com/magefile/mage
-        go run bootstrap.go
-      SCRIPT
-
-      nodeconfig.vm.provision "root-shell", type: "shell", inline: <<-SHELL
+
+      nodeconfig.vm.provision "shell", inline: <<-SHELL
          apt-get update
+         apt-get upgrade -y
          apt-get install -y \
           build-essential \
           curl \
@@ -56,6 +56,7 @@ Vagrant.configure("2") do |config|
          tar -xf /tmp/mage.tar.gz
          mv mage /usr/local/bin
       SHELL
+      nodeconfig.vm.provision "shell", reboot: true
     end
 
 end

testing/e2e/agent_container_test.go

@@ -2,10 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-// FIXME(ml): test suite is disabled by additional build flag.
-//     we do not want to rely on agent builds in our pipeline.
-
-//go:build e2e && ignore
+//go:build e2e
 
 package e2e
 
@@ -15,10 +12,14 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
 	"github.com/elastic/fleet-server/testing/e2e/scaffold"
+
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/mount"
 	"github.com/stretchr/testify/suite"
 	"github.com/testcontainers/testcontainers-go"
 )
@@ -115,11 +116,15 @@ func (suite *AgentContainerSuite) TestHTTP() {
 		},
 		ExposedPorts: []string{"8220/tcp"},
 		Networks:     []string{"integration_default"},
-		Mounts: testcontainers.ContainerMounts{
-			testcontainers.ContainerMount{
-				Source: &testcontainers.GenericBindMountSource{suite.CoverPath},
+		HostConfigModifier: func(cfg *container.HostConfig) {
+			if cfg.Mounts == nil {
+				cfg.Mounts = make([]mount.Mount, 0)
+			}
+			cfg.Mounts = append(cfg.Mounts, mount.Mount{
+				Type:   mount.TypeBind,
+				Source: suite.CoverPath,
 				Target: "/cover",
-			},
+			})
 		},
 		WaitingFor: containerWaitForHealthyStatus(),
 	}
@@ -138,11 +143,6 @@ func (suite *AgentContainerSuite) TestHTTP() {
 }
 
 func (suite *AgentContainerSuite) TestWithSecretFiles() {
-	// Create a service token file in the temp test dir
-	dir := suite.T().TempDir()
-	err := os.WriteFile(filepath.Join(dir, "service-token"), []byte(suite.ServiceToken), 0644)
-	suite.Require().NoError(err)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
@@ -180,17 +180,20 @@ func (suite *AgentContainerSuite) TestWithSecretFiles() {
 			HostFilePath:      filepath.Join(suite.CertPath, "passphrase"),
 			ContainerFilePath: "/tmp/passphrase",
 			FileMode:          0644,
+		}, {
+			Reader:            strings.NewReader(suite.ServiceToken),
+			ContainerFilePath: "/token/service-token",
+			FileMode:          0644,
 		}},
-		Mounts: testcontainers.ContainerMounts{
-			testcontainers.ContainerMount{
-				Source:   &testcontainers.GenericBindMountSource{dir},
-				Target:   "/token",
-				ReadOnly: true,
-			},
-			testcontainers.ContainerMount{
-				Source: &testcontainers.GenericBindMountSource{suite.CoverPath},
+		HostConfigModifier: func(cfg *container.HostConfig) {
+			if cfg.Mounts == nil {
+				cfg.Mounts = make([]mount.Mount, 0)
+			}
+			cfg.Mounts = append(cfg.Mounts, mount.Mount{
+				Type:   mount.TypeBind,
+				Source: suite.CoverPath,
 				Target: "/cover",
-			},
+			})
 		},
 		WaitingFor: containerWaitForHealthyStatus().WithTLS(true, nil),
 	}
@@ -252,11 +255,15 @@ func (suite *AgentContainerSuite) TestSleep10m() {
 			ContainerFilePath: "/tmp/passphrase",
 			FileMode:          0644,
 		}},
-		Mounts: testcontainers.ContainerMounts{
-			testcontainers.ContainerMount{
-				Source: &testcontainers.GenericBindMountSource{suite.CoverPath},
+		HostConfigModifier: func(cfg *container.HostConfig) {
+			if cfg.Mounts == nil {
+				cfg.Mounts = make([]mount.Mount, 0)
+			}
+			cfg.Mounts = append(cfg.Mounts, mount.Mount{
+				Type:   mount.TypeBind,
+				Source: suite.CoverPath,
 				Target: "/cover",
-			},
+			})
 		},
 		WaitingFor: containerWaitForHealthyStatus().WithTLS(true, nil),
 	}
@@ -323,11 +330,15 @@ func (suite *AgentContainerSuite) TestDockerAgent() {
 			ContainerFilePath: "/tmp/passphrase",
 			FileMode:          0644,
 		}},
-		Mounts: testcontainers.ContainerMounts{
-			testcontainers.ContainerMount{
-				Source: &testcontainers.GenericBindMountSource{suite.CoverPath},
+		HostConfigModifier: func(cfg *container.HostConfig) {
+			if cfg.Mounts == nil {
+				cfg.Mounts = make([]mount.Mount, 0)
+			}
+			cfg.Mounts = append(cfg.Mounts, mount.Mount{
+				Type:   mount.TypeBind,
+				Source: suite.CoverPath,
 				Target: "/cover",
-			},
+			})
 		},
 		WaitingFor: containerWaitForHealthyStatus().WithTLS(true, nil),
 	}