Skip to content

Commit 8870c5c

Browse files
Revert "ci: pin elastic-agent version (#8736)" (#8754)
* revert: pin elastic-agent version * bump: ESS stack version * bump: beats dependency
1 parent 9d25699 commit 8870c5c

File tree

10 files changed

+11
-19
lines changed

10 files changed

+11
-19
lines changed

.buildkite/bk.integration-fips.pipeline.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ env:
77
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1751072471"
88
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1751072471"
99
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1751072471"
10-
# Remove AGENT_VERSION pinning once 9.2.0 DRA and stack are released
11-
AGENT_VERSION: "9.1.0-SNAPSHOT"
1210

1311
# This section is used to define the plugins that will be used in the pipeline.
1412
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins

.buildkite/bk.integration.pipeline.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ env:
1212
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1751072471"
1313
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
1414
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1751072471"
15-
# Remove AGENT_PACKAGE_VERSION and AGENT_VERSION pinning once 9.2.0 DRA and stack are released
16-
AGENT_VERSION: "9.1.0-SNAPSHOT"
1715

1816
# This section is used to define the plugins that will be used in the pipeline.
1917
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins

.buildkite/integration.pipeline.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
env:
44
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
5-
# Remove AGENT_PACKAGE_VERSION and AGENT_VERSION pinning once 9.2.0 DRA and stack are released
6-
AGENT_PACKAGE_VERSION: "9.1.0"
7-
BEAT_VERSION: "9.1.0"
85

96
steps:
107
- group: "Integration tests: packaging"

.package-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.1.0
1+
9.2.0

NOTICE-fips.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250625230922-20190076bbd3
790+
Version: v7.0.0-alpha2.0.20250701100201-045d0d83add6
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250625230922-20190076bbd3/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250701100201-045d0d83add6/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250625230922-20190076bbd3
790+
Version: v7.0.0-alpha2.0.20250701100201-045d0d83add6
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250625230922-20190076bbd3/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250701100201-045d0d83add6/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/docker/docker v28.1.1+incompatible
1515
github.com/docker/go-units v0.5.0
1616
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
17-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250625230922-20190076bbd3
17+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250701100201-045d0d83add6
1818
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1919
github.com/elastic/elastic-agent-autodiscover v0.9.2
2020
github.com/elastic/elastic-agent-client/v7 v7.17.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
514514
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
515515
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
516516
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
517-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250625230922-20190076bbd3 h1:u/ckO4G9Zg/1KFlkUcA8cLdKHOKskJwllvxB3Ivu7n8=
518-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250625230922-20190076bbd3/go.mod h1:apN5Sv0n9dW/dJ+i+a+zeC28fmaPCFqeJIh31Y5TWIA=
517+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250701100201-045d0d83add6 h1:t3wet+F1L6up5d+OD1rv+rejlGRGbJEh7I10U4r8Da4=
518+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250701100201-045d0d83add6/go.mod h1:2M1hWjAG5GZHh3seT6LdPc2vCFsumKDed1ND/GKewYM=
519519
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
520520
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
521521
github.com/elastic/elastic-agent-autodiscover v0.9.2 h1:eBmru2v66HRRHOFf89rDl9OZUr7VsPoT4+ZNYHW6e9I=

pkg/testing/ess/create_deployment_csp_configuration.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ aws:
1515
kibana_instance_configuration_id: "aws.kibana.c5d"
1616
# Automatically updated by updatecli-bump-stack-version.yml. Don't change the structure and key names
1717
docker:
18-
integration_server_image: "docker.elastic.co/cloud-release/elastic-agent-cloud:9.1.0-dd974feb-SNAPSHOT"
19-
elasticsearch_image: "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.0-dd974feb-SNAPSHOT"
20-
kibana_image: "docker.elastic.co/cloud-release/kibana-cloud:9.1.0-dd974feb-SNAPSHOT"
18+
integration_server_image: "docker.elastic.co/cloud-release/elastic-agent-cloud:9.2.0-bfc270ed-SNAPSHOT"
19+
elasticsearch_image: "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.2.0-bfc270ed-SNAPSHOT"
20+
kibana_image: "docker.elastic.co/cloud-release/kibana-cloud:9.2.0-bfc270ed-SNAPSHOT"

testing/integration/ess/upgrade_broken_package_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ func TestUpgradeBrokenPackageVersion(t *testing.T) {
3232
Local: false, // requires Agent installation
3333
Sudo: true, // requires Agent installation
3434
})
35-
t.Skip("Skip this test until elastic agent version pinning is removed from Integration test runs on CI")
3635

3736
ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
3837
defer cancel()

0 commit comments

Comments
 (0)