22
33env :
44 DOCKER_COMPOSE_VERSION : " 1.25.5"
5- DOCKER_REGISTRY : " docker.elastic.co"
6- DOCKER_IMAGE : " ${DOCKER_REGISTRY}/observability-ci/fleet-server" # needs to rename for rollback
7- DOCKER_IMAGE_SHA_TAG : " git-${BUILDKITE_COMMIT:0:12}" # needs to rename for rollback, should be "git-${BUILDKITE_COMMIT:0:12}"
8- DOCKER_IMAGE_LATEST_TAG : " latest" # needs to rename for rollback
9- DOCKER_IMAGE_GIT_TAG : " ${BUILDKITE_BRANCH}" # needs to rename for rollback
10- GO_AGENT_IMAGE : " golang:${GO_VERSION}"
115 TERRAFORM_VERSION : " 1.6.4"
126
137steps :
@@ -16,19 +10,15 @@ steps:
1610 steps :
1711 - label : " :white_check_mark: Run check-ci"
1812 key : check-ci
19- command : " make check-ci "
13+ command : " .buildkite/scripts/check_ci.sh "
2014 agents :
21- image : " ${GO_AGENT_IMAGE}"
22- cpu : " 8"
23- memory : " 4G"
15+ provider : " gcp"
2416
2517 - label : " :building_construction: Run local build"
2618 key : make-local
27- command : " make local "
19+ command : " .buildkite/scripts/local_build.sh "
2820 agents :
29- image : " ${GO_AGENT_IMAGE}"
30- cpu : " 8"
31- memory : " 4G"
21+ provider : " gcp"
3222
3323 - label : " :building_construction: Run local build: MacOS"
3424 key : make-local-macos
4333 - label : " Run go benchmark for PR branch"
4434 key : " go-benchmark-pr"
4535 command : " .buildkite/scripts/run_benchmark.sh pr"
36+ env :
37+ BENCHMARK_ARGS : " -count=8 -benchmem"
4638 artifact_paths :
4739 - build/next.out
4840 - build/next.stat
@@ -51,8 +43,11 @@ steps:
5143 machineType : " c2-standard-8"
5244
5345 - label : " Run go benchmark for ${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
46+ skip : true # FIXME: Temporarily disabled until mage is on main
5447 key : " go-benchmark-base"
5548 command : " .buildkite/scripts/run_benchmark.sh base"
49+ env :
50+ BENCHMARK_ARGS : " -count=8 -benchmem"
5651 artifact_paths :
5752 - build/base.out
5853 - build/base.stat
6156 machineType : " c2-standard-8"
6257
6358 - label : " Compare results"
59+ skip : true # FIXME: Temporarily disabled until mage is on main
6460 key : " go-benchmark-compare"
6561 command : " .buildkite/scripts/run_benchmark.sh compare"
6662 artifact_paths :
@@ -87,6 +83,31 @@ steps:
8783 - build/*.xml
8884 - build/coverage*.out
8985
86+ <<<<<<< HEAD
87+ =======
88+ - label : " :smartbear-testexecute: Run unit tests with requirefips build tag"
89+ key : unit-test-fips-tag
90+ command : " .buildkite/scripts/unit_test.sh"
91+ env :
92+ FIPS : " true"
93+ agents :
94+ provider : " gcp"
95+ artifact_paths :
96+ - build/*.xml
97+ - build/coverage*.out
98+
99+ - label : " :smartbear-testexecute: Run fips140=only unit tests"
100+ key : unit-test-fips140-only
101+ command : " .buildkite/scripts/unit_test_fipsonly.sh"
102+ env :
103+ FIPS : " true"
104+ agents :
105+ provider : " gcp"
106+ artifact_paths :
107+ - build/*.xml
108+ - build/coverage*.out
109+
110+ >>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
90111 - label : " :smartbear-testexecute: Run unit tests: MacOS 13"
91112 key : unit-test-macos-13
92113 command : " .buildkite/scripts/unit_test.sh"
@@ -111,13 +132,25 @@ steps:
111132 - label : " E2E Test"
112133 key : " e2e-test"
113134 command : " .buildkite/scripts/e2e_test.sh"
135+ <<<<<<< HEAD
114136 env :
115137 TESTCONTAINERS_RYUK_CONTAINER_PRIVILEGED : " true"
138+ =======
139+ >>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
116140 agents :
117141 provider : " gcp"
118142 artifact_paths :
119143 - build/*.xml
120144 - build/e2e-coverage.out
145+ <<<<<<< HEAD
146+ =======
147+ plugins :
148+ - test-collector#v1.10.2:
149+ files : " build/test-*.xml"
150+ format : " junit"
151+ branches : " main"
152+ debug : true
153+ >>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
121154
122155 - label : " :junit: Junit annotate"
123156 plugins :
@@ -154,6 +187,13 @@ steps:
154187
155188 - label : " :gcloud: Cloud e2e Test"
156189 key : " cloud-e2e-test"
190+ env :
191+ DOCKER_REGISTRY : " docker.elastic.co"
192+ DOCKER_IMAGE : " docker.elastic.co/beats-ci/elastic-agent-cloud-fleet"
193+ DOCKER_IMAGE_TAG : " pr-${BUILDKITE_PULL_REQUEST}-${BUILDKITE_COMMIT:0:12}"
194+ SNAPSHOT : " true"
195+ PLATFORMS : " linux/amd64"
196+ TF_VAR_pull_request : " ${BUILDKITE_PULL_REQUEST}"
157197 command : " .buildkite/scripts/cloud_e2e_test.sh"
158198 agents :
159199 provider : " gcp"
@@ -169,6 +209,12 @@ steps:
169209 - label : " :docker: Publish docker image"
170210 key : " publish"
171211 command : " .buildkite/scripts/build_push_docker_image.sh"
212+ env :
213+ DOCKER_REGISTRY : " docker.elastic.co"
214+ DOCKER_IMAGE : " docker.elastic.co/observability-ci/fleet-server" # needs to rename for rollback
215+ DOCKER_IMAGE_SHA_TAG : " git-${BUILDKITE_COMMIT:0:12}" # needs to rename for rollback, should be "git-${BUILDKITE_COMMIT:0:12}"
216+ DOCKER_IMAGE_LATEST_TAG : " latest" # needs to rename for rollback
217+ DOCKER_IMAGE_GIT_TAG : " ${BUILDKITE_BRANCH}" # needs to rename for rollback
172218 if : " build.env('BUILDKITE_PULL_REQUEST') == 'false' && build.env('BUILDKITE_BRANCH') == 'main'"
173219 agents :
174220 provider : " gcp"
0 commit comments