Skip to content

Commit bca1e32

Browse files
rashmivkulkarnirashmivkulkarni
authored
Merge branch 'main' into a11y
2 parents 96f97a3 + e378c0d commit bca1e32

595 files changed

Lines changed: 16660 additions & 9062 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/pipelines/performance/daily.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
steps:
2-
- block: ':gear: Performance Tests Configuration'
3-
prompt: 'Fill out the details for performance test'
4-
fields:
5-
- text: ':arrows_counterclockwise: Iterations'
6-
key: 'performance-test-iteration-count'
7-
hint: 'How many times you want to run tests? '
8-
required: true
9-
if: build.env('PERF_TEST_COUNT') == null
10-
112
- label: ':male-mechanic::skin-tone-2: Pre-Build'
123
command: .buildkite/scripts/lifecycle/pre_build.sh
134
agents:
@@ -24,7 +15,7 @@ steps:
2415
- label: ':muscle: Performance Tests with Playwright config'
2516
command: .buildkite/scripts/steps/functional/performance_playwright.sh
2617
agents:
27-
queue: c2-16
18+
queue: kb-static-ubuntu
2819
depends_on: build
2920

3021
- wait: ~

‎.buildkite/scripts/steps/functional/performance_playwright.sh‎

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,55 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

3-
set -uo pipefail
3+
set -euo pipefail
44

5-
if [ -z "${PERF_TEST_COUNT+x}" ]; then
6-
TEST_COUNT="$(buildkite-agent meta-data get performance-test-iteration-count)"
7-
else
8-
TEST_COUNT=$PERF_TEST_COUNT
9-
fi
5+
source .buildkite/scripts/common/util.sh
106

11-
tput setab 2; tput setaf 0; echo "Performance test will be run at ${BUILDKITE_BRANCH} ${TEST_COUNT} times"
7+
.buildkite/scripts/bootstrap.sh
8+
.buildkite/scripts/download_build_artifacts.sh
129

13-
cat << EOF | buildkite-agent pipeline upload
14-
steps:
15-
- command: .buildkite/scripts/steps/functional/performance_sub_playwright.sh
16-
parallelism: "$TEST_COUNT"
17-
concurrency: 20
18-
concurrency_group: 'performance-test-group'
19-
agents:
20-
queue: c2-16
21-
EOF
10+
echo --- Run Performance Tests with Playwright config
2211

12+
node scripts/es snapshot&
2313

14+
esPid=$!
2415

16+
export TEST_ES_URL=http://elastic:changeme@localhost:9200
17+
export TEST_ES_DISABLE_STARTUP=true
18+
19+
sleep 120
20+
21+
cd "$XPACK_DIR"
22+
23+
jobId=$(npx uuid)
24+
export TEST_JOB_ID="$jobId"
25+
26+
journeys=("ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard")
27+
28+
for i in "${journeys[@]}"; do
29+
echo "JOURNEY[${i}] is running"
30+
31+
export TEST_PERFORMANCE_PHASE=WARMUP
32+
export ELASTIC_APM_ACTIVE=false
33+
export JOURNEY_NAME="${i}"
34+
35+
checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: WARMUP)" \
36+
node scripts/functional_tests \
37+
--config test/performance/config.playwright.ts \
38+
--include "test/performance/tests/playwright/${i}.ts" \
39+
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
40+
--debug \
41+
--bail
42+
43+
export TEST_PERFORMANCE_PHASE=TEST
44+
export ELASTIC_APM_ACTIVE=true
45+
46+
checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: TEST)" \
47+
node scripts/functional_tests \
48+
--config test/performance/config.playwright.ts \
49+
--include "test/performance/tests/playwright/${i}.ts" \
50+
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
51+
--debug \
52+
--bail
53+
done
54+
55+
kill "$esPid"

‎.buildkite/scripts/steps/functional/performance_sub_playwright.sh‎

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

‎.buildkite/scripts/steps/package_testing/test.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ mkdir -p target
1010
cd target
1111
if [[ "$TEST_PACKAGE" == "deb" ]]; then
1212
buildkite-agent artifact download 'kibana-*.deb' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
13-
KIBANA_IP_ADDRESS="192.168.50.5"
13+
KIBANA_IP_ADDRESS="192.168.56.5"
1414
elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
1515
buildkite-agent artifact download 'kibana-*.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
16-
KIBANA_IP_ADDRESS="192.168.50.6"
16+
KIBANA_IP_ADDRESS="192.168.56.6"
1717
elif [[ "$TEST_PACKAGE" == "docker" ]]; then
1818
buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
19-
KIBANA_IP_ADDRESS="192.168.50.7"
19+
KIBANA_IP_ADDRESS="192.168.56.7"
2020
fi
2121
cd ..
2222

2323
export VAGRANT_CWD=test/package
2424
vagrant up "$TEST_PACKAGE" --no-provision
2525

2626
node scripts/es snapshot \
27-
-E network.bind_host=127.0.0.1,192.168.50.1 \
27+
-E network.bind_host=127.0.0.1,192.168.56.1 \
2828
-E discovery.type=single-node \
2929
--license=trial &
3030
while ! timeout 1 bash -c "echo > /dev/tcp/localhost/9200"; do sleep 30; done
@@ -33,7 +33,7 @@ vagrant provision "$TEST_PACKAGE"
3333

3434
export TEST_BROWSER_HEADLESS=1
3535
export TEST_KIBANA_URL="http://elastic:changeme@$KIBANA_IP_ADDRESS:5601"
36-
export TEST_ES_URL=http://elastic:changeme@192.168.50.1:9200
36+
export TEST_ES_URL=http://elastic:changeme@192.168.56.1:9200
3737

3838
cd x-pack
3939
node scripts/functional_test_runner.js --include-tag=smoke

‎.ci/package-testing/Jenkinsfile‎

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

‎.eslintrc.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,10 @@ module.exports = {
14881488
'import/newline-after-import': 'error',
14891489
'react-hooks/exhaustive-deps': 'off',
14901490
'react/jsx-boolean-value': ['error', 'never'],
1491+
'@typescript-eslint/no-unused-vars': [
1492+
'error',
1493+
{ vars: 'all', args: 'after-used', ignoreRestSiblings: true, varsIgnorePattern: '^_' },
1494+
],
14911495
},
14921496
},
14931497
{

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,11 @@
221221
/packages/kbn-test/ @elastic/kibana-operations
222222
/packages/kbn-ui-shared-deps-npm/ @elastic/kibana-operations
223223
/packages/kbn-ui-shared-deps-src/ @elastic/kibana-operations
224+
/packages/kbn-bazel-packages/ @elastic/kibana-operations
224225
/packages/kbn-es-archiver/ @elastic/kibana-operations
225226
/packages/kbn-utils/ @elastic/kibana-operations
226227
/packages/kbn-cli-dev-mode/ @elastic/kibana-operations
228+
/packages/kbn-generate/ @elastic/kibana-operations
227229
/src/cli/keystore/ @elastic/kibana-operations
228230
/.ci/es-snapshots/ @elastic/kibana-operations
229231
/.github/workflows/ @elastic/kibana-operations

‎docs/developer/contributing/development-package-tests.asciidoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ pip3 install --user ansible
2727
[cols=",,",options="header",]
2828
|===
2929
|Hostname |IP |Description
30-
|deb |192.168.50.5 |Installation of Kibana’s deb package
31-
|rpm |192.168.50.6 |Installation of Kibana’s rpm package
32-
|docker |192.168.50.7 |Installation of Kibana’s docker image
30+
|deb |192.168.56.5 |Installation of Kibana’s deb package
31+
|rpm |192.168.56.6 |Installation of Kibana’s rpm package
32+
|docker |192.168.56.7 |Installation of Kibana’s docker image
3333
|===
3434

3535
=== Running
@@ -49,11 +49,11 @@ vagrant provision <hostname>
4949

5050
# Running functional tests
5151
node scripts/es snapshot \
52-
-E network.bind_host=127.0.0.1,192.168.50.1 \
52+
-E network.bind_host=127.0.0.1,192.168.56.1 \
5353
-E discovery.type=single-node \
5454
--license=trial
5555
TEST_KIBANA_URL=http://elastic:changeme@<ip>:5601 \
56-
TEST_ES_URL=http://elastic:changeme@192.168.50.1:9200 \
56+
TEST_ES_URL=http://elastic:changeme@192.168.56.1:9200 \
5757
node scripts/functional_test_runner.js --include-tag=smoke
5858
```
5959

‎docs/development/core/public/kibana-plugin-core-public.asyncplugin.md‎

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

‎docs/development/core/public/kibana-plugin-core-public.asyncplugin.setup.md‎

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

0 commit comments

Comments
 (0)