Skip to content

Commit fcc117e

Browse files
ci: pin agent CI version to 9.1.0
1 parent 9ed114a commit fcc117e

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

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

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

1113
# This section is used to define the plugins that will be used in the pipeline.
1214
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -55,7 +57,7 @@ steps:
5557
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
5658
useCustomGlobalHooks: true
5759
plugins:
58-
- *vault_ec_key_prod
60+
- *vault_ec_key_prod
5961

6062
- group: "fips:Stateful:Ubuntu"
6163
key: integration-tests-ubuntu-fips
@@ -83,7 +85,7 @@ steps:
8385
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
8486
instanceType: "m5.2xlarge"
8587
plugins:
86-
- *vault_ec_key_prod
88+
- *vault_ec_key_prod
8789
matrix:
8890
setup:
8991
sudo:
@@ -113,7 +115,7 @@ steps:
113115
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
114116
instanceType: "m6g.2xlarge"
115117
plugins:
116-
- *vault_ec_key_prod
118+
- *vault_ec_key_prod
117119
matrix:
118120
setup:
119121
sudo:
@@ -153,7 +155,7 @@ steps:
153155
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
154156
useCustomGlobalHooks: true
155157
plugins:
156-
- *vault_ec_key_prod
158+
- *vault_ec_key_prod
157159

158160
- label: Aggregate test reports
159161
depends_on:

.buildkite/bk.integration.pipeline.yml

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

1618
# This section is used to define the plugins that will be used in the pipeline.
1719
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -41,7 +43,7 @@ common:
4143
elastic/vault-secrets#v0.1.0:
4244
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
4345
field: "apiKey"
44-
env_var: "EC_API_KEY"
46+
env_var: "EC_API_KEY"
4547

4648
steps:
4749
- label: Start ESS stack for integration tests
@@ -113,7 +115,7 @@ steps:
113115
image: "${IMAGE_WIN_2025}"
114116
plugins:
115117
- *vault_ec_key_prod
116-
118+
117119
- label: "Ubuntu:2404:amd64:sudo"
118120
depends_on: packaging-ubuntu-x86-64
119121
env:
@@ -298,7 +300,7 @@ steps:
298300
machineType: "n2-standard-8"
299301
image: "${IMAGE_UBUNTU_2404_X86_64}"
300302
plugins:
301-
- *vault_ec_key_prod
303+
- *vault_ec_key_prod
302304
matrix:
303305
- default
304306
- upgrade

.buildkite/integration.pipeline.yml

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

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

69
steps:
710
- group: "Integration tests: packaging"

pkg/testing/ess/create_deployment_csp_configuration.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,3 @@ aws:
1313
elasticsearch_conf_id: "aws.es.datahot.i3"
1414
elasticsearch_deployment_template_id: "aws-storage-optimized"
1515
kibana_instance_configuration_id: "aws.kibana.c5d"
16-
# Automatically updated by updatecli-bump-stack-version.yml. Don't change the structure and key names
17-
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"

testing/integration/ess/upgrade_broken_package_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ 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")
3536

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

0 commit comments

Comments
 (0)