diff --git a/dev-tools/mage/common.go b/dev-tools/mage/common.go index 1c1ca25d95bc..6905d477e403 100644 --- a/dev-tools/mage/common.go +++ b/dev-tools/mage/common.go @@ -219,10 +219,19 @@ func dockerInfo() (*DockerInfo, error) { // HaveDockerCompose returns an error if docker-compose is not found on the // PATH. func HaveDockerCompose() error { - _, err := exec.LookPath("docker-compose") + + path, err := exec.LookPath("docker") + if err != nil { + return fmt.Errorf("docker is not available") + } else { + fmt.Printf("hi fae, docker is at %v\n", path) + } + + path, err = exec.LookPath("docker-compose") if err != nil { return fmt.Errorf("docker-compose is not available") } + fmt.Printf("hi fae, docker compose is %v\n", path) return nil } diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go index 96b98f0b6b80..4450d7d45db1 100644 --- a/dev-tools/mage/integtest.go +++ b/dev-tools/mage/integtest.go @@ -211,6 +211,7 @@ func NewIntegrationRunners(path string, passInEnv map[string]string) (Integratio // NewDockerIntegrationRunner returns an integration runner configured only for docker. func NewDockerIntegrationRunner(passThroughEnvVars ...string) (*IntegrationRunner, error) { + fmt.Printf("hi fae, NewDockerIntegrationRunner\n") cwd, err := os.Getwd() if err != nil { return nil, err @@ -223,9 +224,11 @@ func NewDockerIntegrationRunner(passThroughEnvVars ...string) (*IntegrationRunne } func initRunner(tester IntegrationTester, dir string, passInEnv map[string]string, passThroughEnvVars ...string) (*IntegrationRunner, error) { + fmt.Printf("hi fae, initRunner\n") var runnerSteps IntegrationTestSteps requirements := tester.StepRequirements() if requirements != nil { + fmt.Printf("hi fae, requirements: %v\n", requirements.Name()) runnerSteps = append(runnerSteps, requirements...) } diff --git a/dev-tools/mage/integtest_docker.go b/dev-tools/mage/integtest_docker.go index 8c5fb6d3603f..e135116848ff 100644 --- a/dev-tools/mage/integtest_docker.go +++ b/dev-tools/mage/integtest_docker.go @@ -71,12 +71,15 @@ func (d *DockerIntegrationTester) Use(dir string) (bool, error) { // HasRequirements ensures that the required docker and docker-compose are installed. func (d *DockerIntegrationTester) HasRequirements() error { + fmt.Printf("hi fae, in DockerIntegrationTester.HasRequirements\n") if err := HaveDocker(); err != nil { return err } if err := HaveDockerCompose(); err != nil { return err } + fmt.Printf("everything passed\n") + os.Exit(1) return nil } @@ -88,6 +91,7 @@ func (d *DockerIntegrationTester) StepRequirements() IntegrationTestSteps { // Test performs the tests with docker-compose. The compose file must define a "beat" container, // containing the beats development environment. The tests are executed from within this container. func (d *DockerIntegrationTester) Test(dir string, mageTarget string, env map[string]string) error { + fmt.Printf("hi fae, DockerIntegrationTester.Test\n") var err error buildContainersOnce.Do(func() { err = BuildIntegTestContainers() }) if err != nil { diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go index 7d82d6cb567c..177a2b994c6d 100644 --- a/metricbeat/magefile.go +++ b/metricbeat/magefile.go @@ -226,7 +226,7 @@ func GoIntegTest(ctx context.Context) error { // Use PYTEST_ADDOPTS="-k pattern" to only run tests matching the specified pattern. // Use any other PYTEST_* environment variable to influence the behavior of pytest. func PythonIntegTest(ctx context.Context) error { - fmt.Printf("hi fae\n") + fmt.Printf("hi fae, starting PythonIntegTest\n") if !devtools.IsInIntegTestEnv() { fmt.Printf("!IsInIntegTestEnv\n") mg.SerialDeps(Fields, Dashboards) @@ -236,7 +236,7 @@ func PythonIntegTest(ctx context.Context) error { []string{"ELASTICSEARCH_VERSION", "KIBANA_VERSION", "BEAT_VERSION"}, devtools.ListMatchingEnvVars("PYTEST_")..., ) - fmt.Printf("env vars: %v\n", passThroughEnvVars) + fmt.Printf("hi fae, env vars: %v\n", passThroughEnvVars) //os.Exit(1) runner, err := devtools.NewDockerIntegrationRunner(passThroughEnvVars...) if err != nil {