From 7d0a88146dccc796c43802ac795fd95bdb99b867 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:06:25 +0000 Subject: [PATCH 01/10] chore: Update snapshot.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/integration/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env index d0f9501f8..32c9d7241 100644 --- a/dev-tools/integration/.env +++ b/dev-tools/integration/.env @@ -1,6 +1,6 @@ # If you use change this version without a pinned one, please update # .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml -ELASTICSEARCH_VERSION=8.16.0-3a37a73c-SNAPSHOT +ELASTICSEARCH_VERSION=8.16.0-bff94f3c-SNAPSHOT ELASTICSEARCH_USERNAME=elastic ELASTICSEARCH_PASSWORD=changeme TEST_ELASTICSEARCH_HOSTS=localhost:9200 From 3e949256671899b5c670941079d3668c3c9d7847 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 15:06:26 +0000 Subject: [PATCH 02/10] chore: Update snapshot.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/integration/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env index 32c9d7241..f29633854 100644 --- a/dev-tools/integration/.env +++ b/dev-tools/integration/.env @@ -1,6 +1,6 @@ # If you use change this version without a pinned one, please update # .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml -ELASTICSEARCH_VERSION=8.16.0-bff94f3c-SNAPSHOT +ELASTICSEARCH_VERSION=9.0.0-5fdca544-SNAPSHOT ELASTICSEARCH_USERNAME=elastic ELASTICSEARCH_PASSWORD=changeme TEST_ELASTICSEARCH_HOSTS=localhost:9200 From 0114251dd2c83fd6547e667bb2326b5b734a5d7f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:06:39 +0000 Subject: [PATCH 03/10] chore: Update snapshot.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/integration/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env index f29633854..16b004050 100644 --- a/dev-tools/integration/.env +++ b/dev-tools/integration/.env @@ -1,6 +1,6 @@ # If you use change this version without a pinned one, please update # .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml -ELASTICSEARCH_VERSION=9.0.0-5fdca544-SNAPSHOT +ELASTICSEARCH_VERSION=9.0.0-d56464e5-SNAPSHOT ELASTICSEARCH_USERNAME=elastic ELASTICSEARCH_PASSWORD=changeme TEST_ELASTICSEARCH_HOSTS=localhost:9200 From 697356b2b968592a2f72e1dc5aefe1839eafd61b Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Tue, 17 Sep 2024 09:33:13 -0700 Subject: [PATCH 04/10] Remove -amd64 tags --- dev-tools/e2e/docker-compose.yml | 4 ++-- dev-tools/integration/docker-compose.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-tools/e2e/docker-compose.yml b/dev-tools/e2e/docker-compose.yml index 11c43eb5d..c260d2eee 100644 --- a/dev-tools/e2e/docker-compose.yml +++ b/dev-tools/e2e/docker-compose.yml @@ -1,6 +1,6 @@ services: kibana: - image: "docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}-amd64" + image: "docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}" container_name: kibana healthcheck: test: ["CMD", "curl", "-f", "${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}@localhost:5601/api/status"] @@ -17,7 +17,7 @@ services: networks: - integration apm-server: - image: "docker.elastic.co/apm/apm-server:${ELASTICSEARCH_VERSION}-amd64" + image: "docker.elastic.co/apm/apm-server:${ELASTICSEARCH_VERSION}" container_name: apm-server # curl is not in the apm-server image #healthcheck: diff --git a/dev-tools/integration/docker-compose.yml b/dev-tools/integration/docker-compose.yml index c5eead706..132526923 100644 --- a/dev-tools/integration/docker-compose.yml +++ b/dev-tools/integration/docker-compose.yml @@ -3,7 +3,7 @@ volumes: driver: local services: setup: - image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64 + image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION} volumes: - certs:/usr/share/elasticsearch/config/certs user: "0" @@ -45,7 +45,7 @@ services: find . -type f -exec chmod 640 \{\} \;; '; elasticsearch: - image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64" + image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}" container_name: elasticsearch environment: - node.name=es01 @@ -89,7 +89,7 @@ services: depends_on: setup: condition: service_healthy - image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64" + image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}" container_name: elasticsearch-remote environment: - node.name=es02 From ac8f20d4e2494ea66dbc7f674f3a116d7ab47f45 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Tue, 17 Sep 2024 10:55:21 -0700 Subject: [PATCH 05/10] Skip e2e agent container tests --- testing/e2e/agent_container_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/e2e/agent_container_test.go b/testing/e2e/agent_container_test.go index 158645a8c..4a1952295 100644 --- a/testing/e2e/agent_container_test.go +++ b/testing/e2e/agent_container_test.go @@ -37,6 +37,7 @@ type AgentContainerSuite struct { } func TestAgentContainerSuite(t *testing.T) { + t.Skip("Flakey test suite skipped. See https://github.com/elastic/fleet-server/issues/3909") suite.Run(t, new(AgentContainerSuite)) } From 17883a635f34747dcc45f7b1d41bb9badce96f69 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Tue, 17 Sep 2024 12:21:59 -0700 Subject: [PATCH 06/10] Update terraform provider and template --- dev-tools/cloud/terraform/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/cloud/terraform/main.tf b/dev-tools/cloud/terraform/main.tf index 9dc7d75bb..9aa7749ab 100644 --- a/dev-tools/cloud/terraform/main.tf +++ b/dev-tools/cloud/terraform/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { ec = { source = "elastic/ec" - version = "0.9.0" + version = "0.11.0" } } } @@ -47,7 +47,7 @@ resource "ec_deployment" "deployment" { name = format("fleet server PR %s", random_uuid.name.result) region = "gcp-us-west2" version = local.stack_version - deployment_template_id = "gcp-io-optimized-v2" + deployment_template_id = "gcp-general-purpose" tags = { "created_with_terraform" = "true" From 9434ad835eeeeefedd3f6ca98ce22cbb495d2093 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 15:06:40 +0000 Subject: [PATCH 07/10] chore: Update snapshot.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/integration/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env index 16b004050..30fa48c13 100644 --- a/dev-tools/integration/.env +++ b/dev-tools/integration/.env @@ -1,6 +1,6 @@ # If you use change this version without a pinned one, please update # .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml -ELASTICSEARCH_VERSION=9.0.0-d56464e5-SNAPSHOT +ELASTICSEARCH_VERSION=9.0.0-71a571da-SNAPSHOT ELASTICSEARCH_USERNAME=elastic ELASTICSEARCH_PASSWORD=changeme TEST_ELASTICSEARCH_HOSTS=localhost:9200 From b60d163e5a201ed2e146265004dd5650ea87e18d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:06:43 +0000 Subject: [PATCH 08/10] chore: Update snapshot.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/integration/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env index 30fa48c13..7d7f800fe 100644 --- a/dev-tools/integration/.env +++ b/dev-tools/integration/.env @@ -1,6 +1,6 @@ # If you use change this version without a pinned one, please update # .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml -ELASTICSEARCH_VERSION=9.0.0-71a571da-SNAPSHOT +ELASTICSEARCH_VERSION=9.0.0-e70a10ac-SNAPSHOT ELASTICSEARCH_USERNAME=elastic ELASTICSEARCH_PASSWORD=changeme TEST_ELASTICSEARCH_HOSTS=localhost:9200 From 3750daa2854ba95e37ee8e4842e6fec9d9bc0f67 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Thu, 19 Sep 2024 09:58:21 -0700 Subject: [PATCH 09/10] Skip cloude2e test --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index bf8c32e40..405355d9d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -150,6 +150,7 @@ steps: - label: ":gcloud: Cloud e2e Test" key: "cloud-e2e-test" + skip: true command: ".buildkite/scripts/cloud_e2e_test.sh" agents: provider: "gcp" From 6e582bb6521017bb2e41d80f09a44b0f2950f322 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Thu, 19 Sep 2024 11:16:25 -0700 Subject: [PATCH 10/10] Fix integration test --- internal/pkg/bulk/bulk_integration_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/pkg/bulk/bulk_integration_test.go b/internal/pkg/bulk/bulk_integration_test.go index 923cf4166..efc329ad1 100644 --- a/internal/pkg/bulk/bulk_integration_test.go +++ b/internal/pkg/bulk/bulk_integration_test.go @@ -69,8 +69,8 @@ func TestBulkCreate(t *testing.T) { Name: "Invalid utf-8", Index: string([]byte{0xfe, 0xfe, 0xff, 0xff}), Err: es.ErrElastic{ - Status: 500, - Type: "json_parse_exception", + Status: 400, + Type: "parse_exception", }, }, { @@ -100,7 +100,7 @@ func TestBulkCreate(t *testing.T) { // Create id, err := bulker.Create(ctx, test.Index, test.ID, sampleData) if !EqualElastic(test.Err, err) { - t.Fatal(err) + t.Fatalf("expected error: %+v, got: %+v", test.Err, err) } if err != nil { return