From d68d05830f6c85f88bdc98b00cfc181526ec4bb8 Mon Sep 17 00:00:00 2001 From: Kevin Fairise Date: Thu, 1 Aug 2024 11:02:26 +0200 Subject: [PATCH] try with pulumi logs --- .gitlab-ci.yml | 3 ++- e2e-tests/{ => tests}/otel_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) rename e2e-tests/{ => tests}/otel_test.go (95%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5df0ec9fd8e6..64768dfae671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,6 +160,7 @@ prod-deploy-demo-eks: E2E_PRIVATE_KEY_PATH: /tmp/agent-qa-ssh-key E2E_KEY_PAIR_NAME: ci.open-elemetry-collector-contrib E2E_OUTPUT_DIR: $CI_PROJECT_DIR/e2e-output + E2E_PULUMI_VERBOSE_PROGRESS_STREAMS: true script: - cd e2e-tests && go test $TARGETS/... -v timeout 0 --args -docker_secret $(aws ecr get-login-password) @@ -167,6 +168,6 @@ new-e2e-otel-collector: extends: .new_e2e_template needs: ['push-image-agent-qa'] variables: - TARGETS: ./ + TARGETS: ./tests TEAM: otel diff --git a/e2e-tests/otel_test.go b/e2e-tests/tests/otel_test.go similarity index 95% rename from e2e-tests/otel_test.go rename to e2e-tests/tests/otel_test.go index 1fc03f8a4091..118d4d24e6e9 100644 --- a/e2e-tests/otel_test.go +++ b/e2e-tests/tests/otel_test.go @@ -61,16 +61,16 @@ func (v *otelSuite) TestExecute() { } assert.EventuallyWithT(v.T(), func(t *assert.CollectT) { metricsName, err := v.Env().FakeIntake.Client().GetMetricNames() - assert.NoError(v.T(), err) + assert.NoError(t, err) fmt.Printf("metriiiics: %v", metricsName) logs, err := v.Env().FakeIntake.Client().FilterLogs("") for _, l := range logs { fmt.Printf("logs : %v", l.Tags) } - assert.NoError(v.T(), err) - assert.NotEmpty(v.T(), metricsName) - assert.NotEmpty(v.T(), logs) + assert.NoError(t, err) + assert.NotEmpty(t, metricsName) + assert.NotEmpty(t, logs) }, 1*time.Minute, 10*time.Second)