From 3fda88b45ac3f1fc3e0c6fd84b59990db6016bc5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:27:08 +0000 Subject: [PATCH 1/3] [main][Automation] Update versions (#5820) These files are used for picking the starting (pre-upgrade) or ending (post-upgrade) agent versions in upgrade integration tests. The content is based on responses from https://www.elastic.co/api/product_versions and https://snapshots.elastic.co The current update is generated based on the following requirements: Package version: 9.0.0 ```json { "UpgradeToVersion": "9.0.0", "CurrentMajors": 1, "PreviousMajors": 1, "PreviousMinors": 2, "SnapshotBranches": [ "8.15", "8.x", "7.17" ] } ``` Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Denis --- .package-version | 2 +- pkg/testing/ess/create_deployment_request.tmpl.json | 6 ++++-- .../integration/testdata/.upgrade-test-agent-versions.yml | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.package-version b/.package-version index a8759e74384..c9277c5a601 100644 --- a/.package-version +++ b/.package-version @@ -1 +1 @@ -8.16.0 \ No newline at end of file +9.0.0 \ No newline at end of file diff --git a/pkg/testing/ess/create_deployment_request.tmpl.json b/pkg/testing/ess/create_deployment_request.tmpl.json index 3ef93868708..561b40c9428 100644 --- a/pkg/testing/ess/create_deployment_request.tmpl.json +++ b/pkg/testing/ess/create_deployment_request.tmpl.json @@ -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 } } }, @@ -99,4 +101,4 @@ "system_owned": false, "tags": {{ json .request.Tags }} } -} \ No newline at end of file +} diff --git a/testing/integration/testdata/.upgrade-test-agent-versions.yml b/testing/integration/testdata/.upgrade-test-agent-versions.yml index f6e55d7e978..9c54b6dc593 100644 --- a/testing/integration/testdata/.upgrade-test-agent-versions.yml +++ b/testing/integration/testdata/.upgrade-test-agent-versions.yml @@ -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 From 64738b1971816a1c28441aa57ae180cc90f8d550 Mon Sep 17 00:00:00 2001 From: Alexandros Sapranidis Date: Thu, 24 Oct 2024 09:02:22 +0300 Subject: [PATCH 2/3] Add notification for when the packaging pipeline fails (#5844) Signed-off-by: Alexandros Sapranidis --- catalog-info.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/catalog-info.yaml b/catalog-info.yaml index 3b929448839..b9dc2d8d5c6 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -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 From 932a09a4e8dace13ccc5d7d75024c936395cbef5 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 24 Oct 2024 12:14:39 +0200 Subject: [PATCH 3/3] Switch crossbuilding to Debian 11 (#5847) 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. --- .../fragments/1729750939-crossbuild-debian11.yaml | 4 ++++ dev-tools/mage/crossbuild.go | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 changelog/fragments/1729750939-crossbuild-debian11.yaml diff --git a/changelog/fragments/1729750939-crossbuild-debian11.yaml b/changelog/fragments/1729750939-crossbuild-debian11.yaml new file mode 100644 index 00000000000..dd3b512f1df --- /dev/null +++ b/changelog/fragments/1729750939-crossbuild-debian11.yaml @@ -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 diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go index edb7c5c882a..30750602118 100644 --- a/dev-tools/mage/crossbuild.go +++ b/dev-tools/mage/crossbuild.go @@ -225,9 +225,9 @@ 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": @@ -235,15 +235,13 @@ func CrossBuildImage(platform string) (string, error) { 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()