Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/elastic/ope…
Browse files Browse the repository at this point in the history
…ntelemetry-lib-0.13.0
  • Loading branch information
kaanyalti authored Oct 24, 2024
2 parents 80abd14 + 932a09a commit 0456cfd
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .package-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.16.0
9.0.0
5 changes: 5 additions & 0 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ spec:
spec:
repository: elastic/elastic-agent
pipeline_file: ".buildkite/pipeline.elastic-agent-package.yml"
env:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
SLACK_NOTIFICATIONS_CHANNEL: "#ingest-notifications"
SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
provider_settings:
build_pull_request_forks: false
build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot
Expand Down
4 changes: 4 additions & 0 deletions changelog/fragments/1729750939-crossbuild-debian11.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kind: breaking-change
summary: crossbuild-debian11
description: We're dropping support for Debian 10, so no need to crossbuild using the outdated image anymore. This also updates the statically linked glibc from 2.19 to 2.31.
component: elastic-agent
14 changes: 6 additions & 8 deletions dev-tools/mage/crossbuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,25 +225,23 @@ func CrossBuildImage(platform string) (string, error) {

switch {
case platform == "darwin/amd64":
tagSuffix = "darwin-debian10"
tagSuffix = "darwin-debian11"
case platform == "darwin/arm64" || platform == "darwin/universal":
tagSuffix = "darwin-arm64-debian10"
tagSuffix = "darwin-arm64-debian11"
case platform == "linux/arm64":
tagSuffix = "arm"
case platform == "linux/armv5" || platform == "linux/armv6":
tagSuffix = "armel"
case platform == "linux/armv7":
tagSuffix = "armhf"
case strings.HasPrefix(platform, "linux/mips"):
tagSuffix = "mips-debian10"
tagSuffix = "mips-debian11"
case strings.HasPrefix(platform, "linux/ppc"):
tagSuffix = "ppc-debian10"
tagSuffix = "ppc-debian11"
case platform == "linux/s390x":
tagSuffix = "s390x-debian10"
tagSuffix = "s390x-debian11"
case strings.HasPrefix(platform, "linux"):
// Use an older version of libc to gain greater OS compatibility.
// Debian 8 uses glibc 2.19.
tagSuffix = "main-debian8"
tagSuffix = "main-debian11"
}

goVersion, err := GoVersion()
Expand Down
6 changes: 4 additions & 2 deletions pkg/testing/ess/create_deployment_request.tmpl.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@
"kibana": {
"version": "{{ .request.Version }}",
"user_settings_json": {
"xpack.fleet.enableExperimental": ["agentTamperProtectionEnabled"]
"xpack.fleet.enableExperimental": ["agentTamperProtectionEnabled"],
"xpack.fleet.internal.registry.kibanaVersionCheckEnabled": false,
"server.restrictInternalApis": false
}
}
},
Expand All @@ -99,4 +101,4 @@
"system_owned": false,
"tags": {{ json .request.Tags }}
}
}
}
6 changes: 3 additions & 3 deletions testing/integration/testdata/.upgrade-test-agent-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

testVersions:
- 8.16.0-SNAPSHOT
- 8.15.2-SNAPSHOT
- 8.15.1
- 8.15.0
- 8.15.3
- 8.15.3-SNAPSHOT
- 8.15.2
- 7.17.25-SNAPSHOT

0 comments on commit 0456cfd

Please sign in to comment.