Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[updatecli] update elastic stack version for testing 9.0.0-e70a10ac-SNAPSHOT #3893

Merged
merged 10 commits into from
Sep 19, 2024
1 change: 1 addition & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ steps:

- label: ":gcloud: Cloud e2e Test"
key: "cloud-e2e-test"
skip: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tracked with #3920

command: ".buildkite/scripts/cloud_e2e_test.sh"
agents:
provider: "gcp"
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/cloud/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
ec = {
source = "elastic/ec"
version = "0.9.0"
version = "0.11.0"
}
}
}
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/e2e/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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"]
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/integration/.env
Original file line number Diff line number Diff line change
@@ -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=9.0.0-e70a10ac-SNAPSHOT
ELASTICSEARCH_USERNAME=elastic
ELASTICSEARCH_PASSWORD=changeme
TEST_ELASTICSEARCH_HOSTS=localhost:9200
Expand Down
6 changes: 3 additions & 3 deletions dev-tools/integration/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/pkg/bulk/bulk_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
{
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testing/e2e/agent_container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down
Loading