Skip to content

Commit b4af28b

Browse files
authored
[CI] Integration tests matrix pipeline (#4959)
* [CI] Integration tests matrix pipeline * [CI] Integration tests matrix pipeline * Removed pipeline slug for integration tests hooks * Removed pipeline slug for integration tests hooks * Commented Windows AMD 64 tests from support matrix due to an issue * Commented Windows AMD 64 tests from support matrix due to an issue
1 parent 727eb6a commit b4af28b

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

.buildkite/hooks/pre-command

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-package" ]]; then
4646
fi
4747
fi
4848

49-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-extended-testing" && "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
49+
if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
50+
echo "Setting credentials"
5051
# Set GCP credentials
5152
export GOOGLE_APPLICATION_GCP_SECRET=$(retry 5 vault kv get -format=json -field=data ${CI_GCP_OBS_PATH})
5253
echo "${GOOGLE_APPLICATION_GCP_SECRET}" > ./gcp.json

.buildkite/hooks/pre-exit

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eo pipefail
44

5-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-extended-testing" && "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
5+
if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
66
if [[ -z "${WORKSPACE-""}" ]]; then
77
WORKSPACE=$(git rev-parse --show-toplevel)
88
fi
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
3+
env:
4+
DOCKER_REGISTRY: "docker.elastic.co"
5+
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
6+
7+
steps:
8+
- label: "Integration test matrix"
9+
key: "integration-tests-matrix"
10+
command: ".buildkite/scripts/steps/integration_tests.sh stateful integration:matrix"
11+
artifact_paths:
12+
- "build/TEST-**"
13+
- "build/diagnostics/*"
14+
agents:
15+
provider: "gcp"
16+
machineType: "n1-standard-8"

pkg/testing/runner/supported.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ var (
137137
},
138138
Runner: WindowsRunner{},
139139
}
140+
140141
// WindowsAMD64_2016 - Windows (amd64) Server 2016
141142
WindowsAMD64_2016 = SupportedOS{
142143
OS: define.OS{
@@ -177,8 +178,9 @@ var supported = []SupportedOS{
177178
WindowsAMD64_2022_Core,
178179
WindowsAMD64_2019,
179180
WindowsAMD64_2019_Core,
180-
WindowsAMD64_2016,
181-
WindowsAMD64_2016_Core,
181+
// https://github.com/elastic/ingest-dev/issues/3484
182+
// WindowsAMD64_2016,
183+
// WindowsAMD64_2016_Core,
182184
}
183185

184186
// osMatch returns true when the specific OS is a match for a non-specific OS.

0 commit comments

Comments
 (0)