From e9de179aed523087392014ddfe13e632546f5e9a Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Thu, 28 Mar 2024 14:14:50 +0200 Subject: [PATCH] added kind & kuve env vars, set higer ulimit --- .buildkite/auditbeat/auditbeat-pipeline.yml | 2 +- .buildkite/env-scripts/env.sh | 8 ++++++++ .buildkite/filebeat/filebeat-pipeline.yml | 1 - .buildkite/hooks/pre-command | 4 ++-- .buildkite/pull-requests.json | 10 +++++----- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index 1905d63de317..a8def81f1fa0 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -4,7 +4,7 @@ name: "beats-auditbeat" env: BEATS_PROJECT_NAME: "auditbeat" IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204" - AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2004-aarch64" + AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" IMAGE_RHEL9: "family/platform-ingest-beats-rhel-9" IMAGE_WIN_10: "family/platform-ingest-beats-windows-10" IMAGE_WIN_11: "family/platform-ingest-beats-windows-11" diff --git a/.buildkite/env-scripts/env.sh b/.buildkite/env-scripts/env.sh index f28658a107d3..b30b26c3e8a4 100644 --- a/.buildkite/env-scripts/env.sh +++ b/.buildkite/env-scripts/env.sh @@ -30,6 +30,9 @@ ONLY_DOCS=$(changeset_applies "$DOCS_CHANGESET") PACKAGING_CHANGES=$(changeset_applies "$PACKAGING_CHANGESET") GO_MOD_CHANGES=$(changeset_applies "^go.mod") +KIND_VERSION="v0.20.0" +KUBECONFIG="${WORKSPACE}/kubecfg" + export REPO export WORKSPACE export BIN @@ -51,3 +54,8 @@ export DOCKER_REGISTRY export ONLY_DOCS export PACKAGING_CHANGES export GO_MOD_CHANGES + +export KIND_VERSION +export KUBECONFIG + +add_bin_path diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index c67871f17225..9daeef287d91 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -5,7 +5,6 @@ env: BEATS_PROJECT_NAME: "filebeat" IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204" AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" - IMAGE_RHEL9: "family/platform-ingest-beats-rhel-9" IMAGE_WIN_10: "family/platform-ingest-beats-windows-10" IMAGE_WIN_11: "family/platform-ingest-beats-windows-11" IMAGE_WIN_2016: "family/platform-ingest-beats-windows-2016" diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 96368764743e..c5a43d44f8df 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -24,8 +24,8 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats" || "$BUILDKITE_PIPELINE_SLUG" == "fi fi # To prevent "OSError: [Errno 24] Too many open files" - ulimit -Sn 50000 - echo "Ulimit: $(ulimit)" + ulimit -Sn 80000 + echo "--- Ulimit: $(ulimit)" echo "--- Setting up environment" add_bin_path diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index 8219bb2c9e98..abf9580c2086 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -26,7 +26,7 @@ "build_on_commit": true, "build_on_comment": true, "trigger_comment_regex": "^/test filebeat(for (arm|macos|windows|extended support))?$|^/packag[ing|e]$", - "always_trigger_comment_regex": "^/test filebeat(for (arm|macos|windows|extended support))?$|^/package filebeat$", + "always_trigger_comment_regex": "^/test filebeat(for (arm|macos|windows|extended support))?$|^/packag[ing|e]$", "skip_ci_labels": [ ], "skip_target_branches": [ ], "skip_ci_on_only_changed": [ ], @@ -57,8 +57,8 @@ "set_commit_status": true, "build_on_commit": true, "build_on_comment": true, - "trigger_comment_regex": "^/test auditbeat(for (arm|macos|windows|extended support))?$", - "always_trigger_comment_regex": "^/test auditbeat(for (arm|macos|windows|extended support))?$", + "trigger_comment_regex": "^/test auditbeat(for (arm|macos|windows|extended support))?$|^/packag[ing|e]$", + "always_trigger_comment_regex": "^/test auditbeat(for (arm|macos|windows|extended support))?$|^/packag[ing|e]$", "skip_ci_labels": [ ], "skip_target_branches": [ ], "skip_ci_on_only_changed": [ ], @@ -73,8 +73,8 @@ "set_commit_status": true, "build_on_commit": true, "build_on_comment": true, - "trigger_comment_regex": "^/test heartbeat(for (arm|macos|windows|extended support))?$|^/package heartbeat$", - "always_trigger_comment_regex": "^/test heartbeat(for (arm|macos|windows|extended support))?$|^/package heartbeat$", + "trigger_comment_regex": "^/test heartbeat(for (arm|macos|windows|extended support))?$|^/packag[ing|e]$", + "always_trigger_comment_regex": "^/test heartbeat(for (arm|macos|windows|extended support))?$|^/packag[ing|e]$", "skip_ci_labels": [ ], "skip_target_branches": [ ], "skip_ci_on_only_changed": [ ],