Skip to content

Revert "ci: pin elastic-agent version (#8736)" #8754

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 3, 2025
Merged

Revert "ci: pin elastic-agent version (#8736)" #8754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85d1923
revert: pin elastic-agent version
pkoutsovasilis Jun 30, 2025
65a1671
bump: ESS stack version
pkoutsovasilis Jul 1, 2025
b227ae9
bump: beats dependency
pkoutsovasilis Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .buildkite/bk.integration-fips.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ env:
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1751072471"
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1751072471"
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1751072471"
# Remove AGENT_VERSION pinning once 9.2.0 DRA and stack are released
AGENT_VERSION: "9.1.0-SNAPSHOT"

steps:
- label: Build and push custom elastic-agent image
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/bk.integration.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ env:
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1751072471"
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1751072471"
# Remove AGENT_PACKAGE_VERSION and AGENT_VERSION pinning once 9.2.0 DRA and stack are released
AGENT_VERSION: "9.1.0-SNAPSHOT"

# This section is used to define the plugins that will be used in the pipeline.
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/integration.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

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

steps:
- group: "Integration tests: packaging"
Expand Down
2 changes: 1 addition & 1 deletion .package-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.0
9.2.0
4 changes: 2 additions & 2 deletions NOTICE-fips.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20250625230922-20190076bbd3
Version: v7.0.0-alpha2.0.20250701100201-045d0d83add6
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

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

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down
4 changes: 2 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20250625230922-20190076bbd3
Version: v7.0.0-alpha2.0.20250701100201-045d0d83add6
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

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

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/docker/docker v28.1.1+incompatible
github.com/docker/go-units v0.5.0
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250625230922-20190076bbd3
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250701100201-045d0d83add6
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
github.com/elastic/elastic-agent-autodiscover v0.9.2
github.com/elastic/elastic-agent-client/v7 v7.17.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250625230922-20190076bbd3 h1:u/ckO4G9Zg/1KFlkUcA8cLdKHOKskJwllvxB3Ivu7n8=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250625230922-20190076bbd3/go.mod h1:apN5Sv0n9dW/dJ+i+a+zeC28fmaPCFqeJIh31Y5TWIA=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250701100201-045d0d83add6 h1:t3wet+F1L6up5d+OD1rv+rejlGRGbJEh7I10U4r8Da4=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250701100201-045d0d83add6/go.mod h1:2M1hWjAG5GZHh3seT6LdPc2vCFsumKDed1ND/GKewYM=
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
github.com/elastic/elastic-agent-autodiscover v0.9.2 h1:eBmru2v66HRRHOFf89rDl9OZUr7VsPoT4+ZNYHW6e9I=
Expand Down
6 changes: 3 additions & 3 deletions pkg/testing/ess/create_deployment_csp_configuration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ aws:
kibana_instance_configuration_id: "aws.kibana.c5d"
# Automatically updated by updatecli-bump-stack-version.yml. Don't change the structure and key names
docker:
integration_server_image: "docker.elastic.co/cloud-release/elastic-agent-cloud:9.1.0-dd974feb-SNAPSHOT"
elasticsearch_image: "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.0-dd974feb-SNAPSHOT"
kibana_image: "docker.elastic.co/cloud-release/kibana-cloud:9.1.0-dd974feb-SNAPSHOT"
integration_server_image: "docker.elastic.co/cloud-release/elastic-agent-cloud:9.2.0-bfc270ed-SNAPSHOT"
elasticsearch_image: "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.2.0-bfc270ed-SNAPSHOT"
kibana_image: "docker.elastic.co/cloud-release/kibana-cloud:9.2.0-bfc270ed-SNAPSHOT"
1 change: 0 additions & 1 deletion testing/integration/ess/upgrade_broken_package_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ func TestUpgradeBrokenPackageVersion(t *testing.T) {
Local: false, // requires Agent installation
Sudo: true, // requires Agent installation
})
t.Skip("Skip this test until elastic agent version pinning is removed from Integration test runs on CI")

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