Skip to content

Commit

Permalink
Merge branch 'main' into 25069-mysql_fix_query_for_5_7_version
Browse files Browse the repository at this point in the history
  • Loading branch information
@kush-elastic
kush-elastic authored May 15, 2024
2 parents e1aba59 + 3b4bb54 commit a419871
Show file tree
Hide file tree
Showing 100 changed files with 2,241 additions and 1,997 deletions.
46 changes: 29 additions & 17 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ env:
# Other deps
ASDF_MAGE_VERSION: 1.15.0

# Unit tests
RACE_DETECTOR: "true"
TEST_COVERAGE: "true"

steps:
- group: "Auditbeat Mandatory Testing"
key: "auditbeat-mandatory-tests"
Expand All @@ -34,7 +38,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -53,7 +57,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_RHEL9}"
Expand All @@ -71,7 +75,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2016}"
Expand All @@ -91,7 +95,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2022}"
Expand All @@ -112,7 +116,7 @@ steps:
GOX_FLAGS: "-arch amd64"
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -128,14 +132,14 @@ steps:
steps:
- label: ":linux: Auditbeat Ubuntu Integration Tests"
key: "auditbeat-extended-integ-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
command: |
set -euo pipefail
cd auditbeat
mage build integTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -149,14 +153,14 @@ steps:

- label: ":linux: Auditbeat Ubuntu arm64 Integration Tests"
key: "auditbeat-extended-arm64-integ-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
command: |
set -euo pipefail
cd auditbeat
mage build integTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand All @@ -177,7 +181,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand All @@ -190,15 +194,15 @@ steps:
context: "auditbeat: Linux arm64 Unit Tests"

- label: ":mac: Auditbeat macOS x86_64 Unit Tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
cd auditbeat
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_X86_64}"
Expand All @@ -210,15 +214,15 @@ steps:
context: "auditbeat: macOS x86_64 Unit Tests"

- label: ":mac: Auditbeat macOS arm64 ARM Unit Tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
cd auditbeat
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "orka"
imagePrefix: "${IMAGE_MACOS_ARM}"
Expand All @@ -241,7 +245,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_2019}"
Expand All @@ -262,7 +266,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_10}"
Expand All @@ -283,7 +287,7 @@ steps:
mage build unitTest
retry:
automatic:
- limit: 3
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_WIN_11}"
Expand Down Expand Up @@ -316,6 +320,10 @@ steps:
set -euo pipefail
cd auditbeat
mage package
retry:
automatic:
- limit: 3
timeout_in_minutes: 20
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -334,6 +342,10 @@ steps:
set -euo pipefail
cd auditbeat
mage package
retry:
automatic:
- limit: 3
timeout_in_minutes: 20
agents:
provider: "aws"
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
Expand Down
71 changes: 53 additions & 18 deletions .buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,78 +3,113 @@
env:
IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
MODULE: "kubernetes"

# Other deps
ASDF_KIND_VERSION: "0.20.0"

steps:
- group: "Deploy/K8S"
if: build.env("BUILDKITE_PULL_REQUEST") != "false" && build.env("GITHUB_PR_LABELS") =~ /.*kubernetes.*/

steps:
- label: "Checks"
command: ".buildkite/deploy/kubernetes/scripts/make.sh"
command: |
set -euo pipefail
make -C deploy/kubernetes all
make check-no-changes
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
notify:
- github_commit_status:
context: "Deploy/k8s-checks"
context: "deploy/k8s checks"

- label: "K8S Test/K8S version: v1.29.0"
key: "k8s-test-129"
env:
K8S_VERSION: "v1.29.0"
commands:
- "MODULE=kubernetes make -C metricbeat integration-tests"
- "make -C deploy/kubernetes test"
MODULE: "${MODULE}"
commands: |
set -euo pipefail
source .buildkite/deploy/kubernetes/scripts/setup-k8s-env.sh
echo "--- Executing Tests"
make -C metricbeat integration-tests
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
notify:
- github_commit_status:
context: "Deploy/k8s-test v1.29.0"
context: "deploy/k8s test v1.29.0"

- label: "K8S Test/K8S version: v1.28.0"
key: "k8s-test-128"
env:
K8S_VERSION: "v1.28.0"
commands:
- "MODULE=kubernetes make -C metricbeat integration-tests"
- "make -C deploy/kubernetes test"
MODULE: "${MODULE}"
commands: |
set -euo pipefail
source .buildkite/deploy/kubernetes/scripts/setup-k8s-env.sh
echo "--- Executing Tests"
make -C metricbeat integration-tests
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
notify:
- github_commit_status:
context: "Deploy/k8s-test v1.28.0"
context: "deploy/k8s test v1.28.0"

- label: "K8S Test/K8S version: v1.27.3"
key: "k8s-test-1273"
env:
K8S_VERSION: "v1.27.3"
commands:
- "MODULE=kubernetes make -C metricbeat integration-tests"
- "make -C deploy/kubernetes test"
MODULE: "${MODULE}"
commands: |
set -euo pipefail
source .buildkite/deploy/kubernetes/scripts/setup-k8s-env.sh
echo "--- Executing Tests"
make -C metricbeat integration-tests
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
notify:
- github_commit_status:
context: "Deploy/k8s-test v1.27.3"
context: "deploy/k8s test v1.27.3"

- label: "K8S Test/K8S version: v1.26.6"
key: "k8s-test-1266"
env:
K8S_VERSION: "v1.26.6"
commands:
- "MODULE=kubernetes make -C metricbeat integration-tests"
- "make -C deploy/kubernetes test"
MODULE: "${MODULE}"
commands: |
set -euo pipefail
source .buildkite/deploy/kubernetes/scripts/setup-k8s-env.sh
echo "--- Executing Tests"
make -C metricbeat integration-tests
make -C deploy/kubernetes test
retry:
automatic:
- limit: 3
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
notify:
- github_commit_status:
context: "Deploy/k8s-test v1.26.6"
context: "deploy/k8s test v1.26.6"
40 changes: 0 additions & 40 deletions .buildkite/deploy/kubernetes/scripts/install-kind.sh
View file

This file was deleted.

42 changes: 0 additions & 42 deletions .buildkite/deploy/kubernetes/scripts/install-kubectl.sh
View file

This file was deleted.

Loading

0 comments on commit a419871

Please sign in to comment.