From b4adc92b0ce50f6fe74c51ae0316389573e8a1b4 Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Mon, 5 Feb 2024 00:26:37 +0000
Subject: [PATCH 1/8] [CI] MacOS 13 Unit tests
---
.buildkite/pipeline.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 7d279b090..41288ddf5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -79,6 +79,16 @@ steps:
- build/*.xml
- build/coverage.out
+ - label: ":smartbear-testexecute: Run unit tests: MacOS 13"
+ key: unit-test-macos-13
+ command: ".buildkite/scripts/unit_test.sh"
+ agents:
+ provider: orka
+ imagePrefix: generic-13-ventura-arm
+ artifact_paths:
+ - build/*.xml
+ - build/coverage.out
+
- label: ":smartbear-testexecute: Run integration tests"
key: int-test
command: ".buildkite/scripts/integration_test.sh"
From 71515e048856d652268ad2928273dd1313cc2dff Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Mon, 5 Feb 2024 00:44:35 +0000
Subject: [PATCH 2/8] Fixed platform_type lowercase
---
.buildkite/pipeline.yml | 16 ++++++++++++++++
.buildkite/scripts/common.sh | 9 ++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 41288ddf5..203f5841c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -31,6 +31,18 @@ steps:
cpu: "8"
memory: "4G"
+ # - group: "Check and build: MacOS"
+ # key: "check"
+ # steps:
+ # - label: ":white_check_mark: Run check-ci"
+ # key: check-ci
+ # command: |
+ # make check-ci
+ # make local
+ # agents:
+ # provider: orka
+ # imagePrefix: generic-13-ventura-arm
+
- group: "Performance test"
key: "performance-test"
steps:
@@ -115,6 +127,8 @@ steps:
depends_on:
- step: "unit-test"
allow_failure: true
+ - step: "unit-test-macos-13"
+ allow_failure: true
- step: "int-test"
allow_failure: true
- step: "e2e-test"
@@ -134,6 +148,8 @@ steps:
allow_failure: false
- step: "e2e-test"
allow_failure: false
+ - step: "unit-test-macos-13"
+ allow_failure: false
- label: ":gcloud: Cloud e2e Test"
key: "cloud-e2e-test"
diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
index 5018d0210..5fb206666 100755
--- a/.buildkite/scripts/common.sh
+++ b/.buildkite/scripts/common.sh
@@ -5,8 +5,7 @@ set -euo pipefail
WORKSPACE="$(pwd)/bin"
TMP_FOLDER_TEMPLATE_BASE="tmp.fleet-server"
REPO="fleet-server"
-platform_type="$(uname)"
-platform_type_lowercase="${platform_type,,}"
+platform_type=$(uname | tr '[:upper:]' '[:lower:]')
hw_type="$(uname -m)"
check_platform_architeture() {
@@ -43,7 +42,7 @@ with_go() {
echo "Setting up the Go environment..."
create_workspace
check_platform_architeture
- retry 5 curl -sL -o ${WORKSPACE}/gvm "https://github.com/andrewkroh/gvm/releases/download/${SETUP_GVM_VERSION}/gvm-${platform_type_lowercase}-${arch_type}"
+ retry 5 curl -sL -o ${WORKSPACE}/gvm "https://github.com/andrewkroh/gvm/releases/download/${SETUP_GVM_VERSION}/gvm-${platform_type}-${arch_type}"
chmod +x ${WORKSPACE}/gvm
eval "$(gvm $(cat .go-version))"
go version
@@ -54,7 +53,7 @@ with_go() {
with_docker_compose() {
echo "Setting up the Docker-compose environment..."
create_workspace
- retry 5 curl -sSL -o ${WORKSPACE}/docker-compose "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-${platform_type_lowercase}-${hw_type}"
+ retry 5 curl -sSL -o ${WORKSPACE}/docker-compose "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-${platform_type}-${hw_type}"
chmod +x ${WORKSPACE}/docker-compose
docker-compose version
}
@@ -88,7 +87,7 @@ with_Terraform() {
local path_to_file="${WORKSPACE}/terraform.zip"
create_workspace
check_platform_architeture
- retry 5 curl -sSL -o ${path_to_file} "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${platform_type_lowercase}_${arch_type}.zip"
+ retry 5 curl -sSL -o ${path_to_file} "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${platform_type}_${arch_type}.zip"
unzip -q ${path_to_file} -d ${WORKSPACE}/
rm ${path_to_file}
chmod +x ${WORKSPACE}/terraform
From bbcd2d17e838137dd103e211e7b4d34470b9a00d Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Mon, 5 Feb 2024 00:53:30 +0000
Subject: [PATCH 3/8] [CI] Check CI & Build on MacOS 13
---
.buildkite/pipeline.yml | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 203f5841c..2146aef15 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,18 +30,14 @@ steps:
image: "${GO_AGENT_IMAGE}"
cpu: "8"
memory: "4G"
-
- # - group: "Check and build: MacOS"
- # key: "check"
- # steps:
- # - label: ":white_check_mark: Run check-ci"
- # key: check-ci
- # command: |
- # make check-ci
- # make local
- # agents:
- # provider: orka
- # imagePrefix: generic-13-ventura-arm
+ - label: ":building_construction: Check CI & build: MacOS"
+ key: check-ci-macos
+ command: |
+ make check-ci
+ make local
+ agents:
+ provider: orka
+ imagePrefix: generic-13-ventura-arm
- group: "Performance test"
key: "performance-test"
From e46c1b6a24f112652ab3d744fc161a18ffe4cdda Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Mon, 5 Feb 2024 01:30:36 +0000
Subject: [PATCH 4/8] [CI] Cross-pltform unit test artifacts
---
.buildkite/pipeline.yml | 12 ++----------
Makefile | 6 ++++--
sonar-project.properties | 4 ++--
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2146aef15..7e7b716b0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,14 +30,6 @@ steps:
image: "${GO_AGENT_IMAGE}"
cpu: "8"
memory: "4G"
- - label: ":building_construction: Check CI & build: MacOS"
- key: check-ci-macos
- command: |
- make check-ci
- make local
- agents:
- provider: orka
- imagePrefix: generic-13-ventura-arm
- group: "Performance test"
key: "performance-test"
@@ -85,7 +77,7 @@ steps:
provider: "gcp"
artifact_paths:
- build/*.xml
- - build/coverage.out
+ - build/coverage*.out
- label: ":smartbear-testexecute: Run unit tests: MacOS 13"
key: unit-test-macos-13
@@ -95,7 +87,7 @@ steps:
imagePrefix: generic-13-ventura-arm
artifact_paths:
- build/*.xml
- - build/coverage.out
+ - build/coverage*.out
- label: ":smartbear-testexecute: Run integration tests"
key: int-test
diff --git a/Makefile b/Makefile
index b03ce438b..841998a75 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,8 @@ endif
# Directory to dump build tools into
GOBIN=$(shell go env GOPATH)/bin/
+OS_NAME:=$(shell uname -s)
+
.PHONY: help
help: ## - Show help message
@printf "${CMD_COLOR_ON} usage: make [target]\n\n${CMD_COLOR_OFF}"
@@ -157,8 +159,8 @@ test-release: ## - Check that all release binaries are created
./.buildkite/scripts/test-release.sh $(DEFAULT_VERSION)
.PHONY: test-unit
-test-unit: prepare-test-context ## - Run unit tests only
- set -o pipefail; go test ${GO_TEST_FLAG} -v -race -coverprofile=build/coverage.out ./... | tee build/test-unit.out
+test-unit: prepare-test-context ## - Run unit tests only
+ set -o pipefail; go test ${GO_TEST_FLAG} -v -race -coverprofile=build/coverage-${OS_NAME}.out ./... | tee build/test-unit-${OS_NAME}.out
.PHONY: benchmark
benchmark: prepare-test-context install-benchstat ## - Run benchmark tests only
diff --git a/sonar-project.properties b/sonar-project.properties
index 88f5e6d71..c54fb0e51 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,8 +6,8 @@ sonar.exclusions=**/*_test.go, .git/**, dev-tools/**, /magefile.go, changelog/**
sonar.tests=.
sonar.test.inclusions=**/*_test.go
-sonar.go.tests.reportPaths=build/test-unit.out.xml
-sonar.go.coverage.reportPaths=**/build/coverage.out,**/build/e2e-coverage.out
+sonar.go.tests.reportPaths=build/test-unit*.out.xml
+sonar.go.coverage.reportPaths=**/build/coverage*.out,**/build/e2e-coverage.out
sonar.go.exclusions=**/vendor/**,**/*_mock.go
sonar.sourceEncoding=UTF-8
From 91f2c44981badbde75fffb8da0e41dee005123cb Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Mon, 5 Feb 2024 01:48:23 +0000
Subject: [PATCH 5/8] [CI] Cross-pltform unit test artifacts
---
.buildkite/pipeline.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 7e7b716b0..116ce7db2 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -128,8 +128,8 @@ steps:
agents:
image: "docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest"
command:
- - "buildkite-agent artifact download build/*coverage.out ."
- - "buildkite-agent artifact download build/test-unit.out.xml ."
+ - "buildkite-agent artifact download build/*coverage*.out ."
+ - "buildkite-agent artifact download build/test-unit*.out.xml ."
- "/scan-source-code.sh"
depends_on:
- step: "unit-test"
From 5349bcd326b5ce3cdc6835fea2957f9a1858add1 Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Mon, 5 Feb 2024 11:56:24 +0000
Subject: [PATCH 6/8] [CI] Local build for MacOS
---
.buildkite/pipeline.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 116ce7db2..c1b773c01 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -31,6 +31,16 @@ steps:
cpu: "8"
memory: "4G"
+ - label: ":building_construction: Run local build: MacOS"
+ key: make-local-macos
+ command: |
+ source .buildkite/scripts/common.sh
+ with_go
+ make local
+ agents:
+ provider: orka
+ imagePrefix: generic-13-ventura-arm
+
- group: "Performance test"
key: "performance-test"
steps:
From a4ad68d09081df333e0e9499a6ed6e0a10af3924 Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Mon, 5 Feb 2024 11:59:57 +0000
Subject: [PATCH 7/8] [CI] Local build for MacOS
---
.buildkite/pipeline.yml | 5 +----
.buildkite/scripts/local_build.sh | 9 +++++++++
2 files changed, 10 insertions(+), 4 deletions(-)
create mode 100644 .buildkite/scripts/local_build.sh
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c1b773c01..52bd9f3bc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -33,10 +33,7 @@ steps:
- label: ":building_construction: Run local build: MacOS"
key: make-local-macos
- command: |
- source .buildkite/scripts/common.sh
- with_go
- make local
+ command: ".buildkite/scripts/local_build.sh"
agents:
provider: orka
imagePrefix: generic-13-ventura-arm
diff --git a/.buildkite/scripts/local_build.sh b/.buildkite/scripts/local_build.sh
new file mode 100644
index 000000000..57479cf30
--- /dev/null
+++ b/.buildkite/scripts/local_build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common.sh
+add_bin_path
+with_go
+
+make local
\ No newline at end of file
From 88df6dd31e67cc22244e4dc718e9353caa9a438b Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Thu, 8 Feb 2024 16:41:00 +0100
Subject: [PATCH 8/8] Update Makefile
Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 841998a75..e9ce6c160 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ test-release: ## - Check that all release binaries are created
./.buildkite/scripts/test-release.sh $(DEFAULT_VERSION)
.PHONY: test-unit
-test-unit: prepare-test-context ## - Run unit tests only
+test-unit: prepare-test-context ## - Run unit tests only
set -o pipefail; go test ${GO_TEST_FLAG} -v -race -coverprofile=build/coverage-${OS_NAME}.out ./... | tee build/test-unit-${OS_NAME}.out
.PHONY: benchmark