Skip to content

Commit 679fa2d

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into fix-all-locations-save
2 parents 6b3dd56 + ae0c683 commit 679fa2d

1,220 files changed

Lines changed: 33764 additions & 12850 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ disabled:
3232
- x-pack/test/security_solution_cypress/upgrade_config.ts
3333
- x-pack/test/security_solution_cypress/visual_config.ts
3434
- x-pack/test/functional_enterprise_search/with_host_configured.config.ts
35+
- x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
3536
- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
3637
- x-pack/plugins/apm/ftr_e2e/ftr_config.ts
3738

‎.buildkite/pipelines/artifacts.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ steps:
5252
limit: 1
5353

5454
- command: KIBANA_DOCKER_CONTEXT=cloud .buildkite/scripts/steps/artifacts/docker_context.sh
55+
label: 'Docker Context Verification'
56+
agents:
57+
queue: n2-2
58+
timeout_in_minutes: 30
59+
if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
60+
retry:
61+
automatic:
62+
- exit_status: '*'
63+
limit: 1
64+
65+
- command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
5566
label: 'Docker Context Verification'
5667
agents:
5768
queue: n2-2

‎.buildkite/pull_requests.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,25 @@
1616
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
1717
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
1818
"skip_ci_labels": ["skip-ci", "jenkins-ci"],
19-
"skip_target_branches": ["6.8", "7.11", "7.12"]
19+
"skip_target_branches": ["6.8", "7.11", "7.12"],
20+
"skip_ci_on_only_changed": [
21+
"^docs/",
22+
"^rfcs/",
23+
"^.ci/.+\\.yml$",
24+
"^.ci/es-snapshots/",
25+
"^.ci/pipeline-library/",
26+
"^.ci/Jenkinsfile_[^/]+$",
27+
"^\\.github/",
28+
"\\.md$",
29+
"^\\.backportrc\\.json$",
30+
"^nav-kibana-dev\\.docnav\\.json$",
31+
"^src/dev/prs/kibana_qa_pr_list\\.json$",
32+
"^\\.buildkite/pull_requests\\.json$"
33+
],
34+
"always_require_ci_on_changed": [
35+
"^docs/developer/plugin-list.asciidoc$",
36+
"/plugins/[^/]+/readme\\.(md|asciidoc)$"
37+
]
2038
}
2139
]
2240
}

‎.buildkite/scripts/common/env.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export TEST_BROWSER_HEADLESS=1
3838
export ELASTIC_APM_ENVIRONMENT=ci
3939
export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
4040
export ELASTIC_APM_SERVER_URL=https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io
41+
# Not really a secret, if APM supported public auth we would use it and APM requires that we use this name
4142
export ELASTIC_APM_SECRET_TOKEN=7YKhoXsO4MzjhXjx2c
4243

4344
if is_pr; then

‎.buildkite/scripts/lifecycle/post_command.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
2626
buildkite-agent artifact upload 'x-pack/test/functional/apps/reporting/reports/session/*.pdf'
2727
buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
2828
buildkite-agent artifact upload '.es/**/*.hprof'
29+
buildkite-agent artifact upload 'data/es_debug_*.tar.gz'
2930

3031
echo "--- Run Failed Test Reporter"
3132
node scripts/report_failed_tests --build-url="${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}" 'target/junit/**/*.xml'

‎.buildkite/scripts/pipelines/pull_request/pipeline.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@
99
const execSync = require('child_process').execSync;
1010
const fs = require('fs');
1111
const { areChangesSkippable, doAnyChangesMatch } = require('kibana-buildkite-library');
12-
const { SKIPPABLE_PR_MATCHERS } = require('./skippable_pr_matchers');
13-
14-
const REQUIRED_PATHS = [
15-
// this file is auto-generated and changes to it need to be validated with CI
16-
/^docs\/developer\/plugin-list.asciidoc$/,
17-
// don't skip CI on prs with changes to plugin readme files /i is for case-insensitive matching
18-
/\/plugins\/[^\/]+\/readme\.(md|asciidoc)$/i,
19-
];
12+
const prConfigs = require('../../../pull_requests.json');
13+
const prConfig = prConfigs.jobs.find((job) => job.pipelineSlug === 'kibana-pull-request');
14+
15+
const REQUIRED_PATHS = prConfig.always_require_ci_on_changed.map((r) => new RegExp(r, 'i'));
16+
const SKIPPABLE_PR_MATCHERS = prConfig.skip_ci_on_only_changed.map((r) => new RegExp(r, 'i'));
2017

2118
const getPipeline = (filename, removeSteps = true) => {
2219
const str = fs.readFileSync(filename).toString();

‎.buildkite/scripts/pipelines/pull_request/skippable_pr_matchers.js‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.buildkite/scripts/steps/artifacts/docker_context.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ if [[ "$KIBANA_DOCKER_CONTEXT" == "default" ]]; then
1919
DOCKER_CONTEXT_FILE="kibana-$FULL_VERSION-docker-build-context.tar.gz"
2020
elif [[ "$KIBANA_DOCKER_CONTEXT" == "cloud" ]]; then
2121
DOCKER_CONTEXT_FILE="kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
22+
elif [[ "$KIBANA_DOCKER_CONTEXT" == "ubi" ]]; then
23+
DOCKER_CONTEXT_FILE="kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
2224
fi
2325

2426
tar -xf "target/$DOCKER_CONTEXT_FILE" -C "$DOCKER_BUILD_FOLDER"

‎.buildkite/scripts/steps/es_snapshots/build.sh‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ echo "--- Build Elasticsearch"
6969
:distribution:archives:darwin-aarch64-tar:assemble \
7070
:distribution:archives:darwin-tar:assemble \
7171
:distribution:docker:docker-export:assemble \
72-
:distribution:docker:cloud-docker-export:assemble \
7372
:distribution:archives:linux-aarch64-tar:assemble \
7473
:distribution:archives:linux-tar:assemble \
7574
:distribution:archives:windows-zip:assemble \
@@ -86,19 +85,26 @@ docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}
8685
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:${0} | gzip > ../es-build/elasticsearch-${0}-docker-image.tar.gz'
8786

8887
echo "--- Create kibana-ci docker cloud image archives"
89-
ES_CLOUD_ID=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.ID}}")
90-
ES_CLOUD_VERSION=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.Tag}}")
91-
KIBANA_ES_CLOUD_VERSION="$ES_CLOUD_VERSION-$ELASTICSEARCH_GIT_COMMIT"
92-
KIBANA_ES_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud:$KIBANA_ES_CLOUD_VERSION"
93-
94-
docker tag "$ES_CLOUD_ID" "$KIBANA_ES_CLOUD_IMAGE"
95-
96-
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
97-
trap 'docker logout docker.elastic.co' EXIT
98-
docker image push "$KIBANA_ES_CLOUD_IMAGE"
99-
100-
export ELASTICSEARCH_CLOUD_IMAGE="$KIBANA_ES_CLOUD_IMAGE"
101-
export ELASTICSEARCH_CLOUD_IMAGE_CHECKSUM="$(docker images "$KIBANA_ES_CLOUD_IMAGE" --format "{{.Digest}}")"
88+
# Ignore build failures. This docker image downloads metricbeat and filebeat.
89+
# When we bump versions, these dependencies may not exist yet, but we don't want to
90+
# block the rest of the snapshot promotion process
91+
set +e
92+
./gradlew :distribution:docker:cloud-docker-export:assemble && {
93+
ES_CLOUD_ID=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.ID}}")
94+
ES_CLOUD_VERSION=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.Tag}}")
95+
KIBANA_ES_CLOUD_VERSION="$ES_CLOUD_VERSION-$ELASTICSEARCH_GIT_COMMIT"
96+
KIBANA_ES_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud:$KIBANA_ES_CLOUD_VERSION"
97+
echo $ES_CLOUD_ID $ES_CLOUD_VERSION $KIBANA_ES_CLOUD_VERSION $KIBANA_ES_CLOUD_IMAGE
98+
docker tag "$ES_CLOUD_ID" "$KIBANA_ES_CLOUD_IMAGE"
99+
100+
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
101+
trap 'docker logout docker.elastic.co' EXIT
102+
docker image push "$KIBANA_ES_CLOUD_IMAGE"
103+
104+
export ELASTICSEARCH_CLOUD_IMAGE="$KIBANA_ES_CLOUD_IMAGE"
105+
export ELASTICSEARCH_CLOUD_IMAGE_CHECKSUM="$(docker images "$KIBANA_ES_CLOUD_IMAGE" --format "{{.Digest}}")"
106+
}
107+
set -e
102108

103109
echo "--- Create checksums for snapshot files"
104110
cd "$destination"

0 commit comments

Comments
 (0)