Skip to content

wip testing #128984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b5a8f8a
Add PR upgrade tests from merge base to PR HEAD
mosche Jun 3, 2025
7888006
Expand bcUpgradeTask to run more test suites. Relates to ES-11904
mosche Jun 5, 2025
772138b
Merge branch 'bc-upgrade/pr-upgrade' into bc_upgrades/expand_bcUpgrad…
mosche Jun 5, 2025
4301168
remove from downsample, only contains yaml rest tests
mosche Jun 5, 2025
af00c7a
Merge branch 'bc_upgrades/expand_bcUpgradeTask' into bc_upgrades/expa…
mosche Jun 5, 2025
1cf5ee5
Merge branch 'main' into bc_upgrades/expand_bcUpgradeTask
mosche Jun 5, 2025
6b61a09
Merge branch 'main' into bc_upgrades/expand_bcUpgradeTask
mosche Jun 5, 2025
dc4c969
support security for BC upgrade testing which use the magic version n…
mosche Jun 6, 2025
2388621
Merge branch 'bc_upgrades/expand_bcUpgradeTask' into bc_upgrades/expa…
mosche Jun 6, 2025
e49ca27
support security for BC upgrade testing which use the magic version n…
mosche Jun 6, 2025
8925b38
Merge branch 'bc_upgrades/expand_bcUpgradeTask' into bc_upgrades/expa…
mosche Jun 6, 2025
c97a819
exclude some likely incompatible tests
mosche Jun 6, 2025
860d64f
Merge branch 'bc_upgrades/expand_bcUpgradeTask' into bc_upgrades/expa…
mosche Jun 6, 2025
489fcef
Squashed commit of the following:
ldematte Jun 10, 2025
71e9421
remove exclude
ldematte Jun 10, 2025
abb40e6
Merge remote-tracking branch 'upstream/main' into bc_upgrades/expand_…
ldematte Jun 10, 2025
148ceb2
fix tests to not try and parse versions (unsupported for BWC and serv…
ldematte Jun 10, 2025
d15c863
do not filter re-worked tests
ldematte Jun 10, 2025
938c578
Merge remote-tracking branch 'upstream/main' into bc_upgrades/expand_…
ldematte Jun 10, 2025
bc017b5
revert FileSettingsUpgradeIT change
ldematte Jun 10, 2025
5233b61
revert FileSettingsUpgradeIT change
ldematte Jun 10, 2025
f2aab12
extract bc upgrade test registration in script
ldematte Jun 10, 2025
42e5f34
Merge remote-tracking branch 'upstream/main' into bc_upgrades/expand_…
ldematte Jun 10, 2025
64b7b7b
Merge remote-tracking branch 'upstream/main' into bc_upgrades/expand_…
ldematte Jun 10, 2025
7a9968e
Merge branch 'bc_upgrades/expand_bcUpgradeTask' into bc_upgrades/expa…
ldematte Jun 10, 2025
39f9506
fixes
ldematte Jun 10, 2025
2de1433
more fixes
ldematte Jun 10, 2025
74e8006
Merge remote-tracking branch 'upstream/main' into bc_upgrades/expand_…
ldematte Jun 12, 2025
274ff45
rename
ldematte Jun 12, 2025
067123b
Merge remote-tracking branch 'upstream/main' into bc_upgrades/expand_…
ldematte Jun 12, 2025
cca0240
Merge branch 'bc_upgrades/expand_bcUpgradeTask' into bc_upgrades/expa…
ldematte Jun 12, 2025
847ddce
Merge remote-tracking branch 'upstream/main' into bc_upgrades/expand_…
ldematte Jun 16, 2025
073b1d0
Merge branch 'main' into bc_upgrades/expand_bcUpgradeTask_test
ldematte Jun 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .buildkite/pipelines/pull-request/pr-upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
steps:
- label: pr-upgrade
command: ".buildkite/scripts/run-pr-upgrade-tests.sh"
agents:
image: "docker.elastic.co/ci-agent-images/eck-region/buildkite-agent:1.5"
memory: "4G"
45 changes: 45 additions & 0 deletions .buildkite/scripts/run-pr-upgrade-tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/bin/bash

#
# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
# or more contributor license agreements. Licensed under the "Elastic License
# 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
# Public License v 1"; you may not use this file except in compliance with, at
# your election, the "Elastic License 2.0", the "GNU Affero General Public
# License v3.0 only", or the "Server Side Public License, v 1".
#

set -euo pipefail

if [[ -z "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" ]]; then
echo "Not a pull request, skipping PR upgrade tests."
exit 0
fi

# Identify the merge base of the current commit (branch) and the base branch of the pull request.
# PR upgrade tests are run from the merge base to the current commit.
BASE_COMMIT=$(git merge-base $BUILDKITE_PULL_REQUEST_BASE_BRANCH $BUILDKITE_COMMIT)

VERSION=$(sed -n 's/^elasticsearch[[:space:]]*=[[:space:]]*\(.*\)/\1/p' build-tools-internal/version.properties)

echo "Running PR upgrade tests from $BUILDKITE_PULL_REQUEST_BASE_BRANCH [$BASE_COMMIT] to $BUILDKITE_BRANCH [$BUILDKITE_COMMIT]."

cat <<EOF | buildkite-agent pipeline upload
steps:
- label: pr-upgrade $BUILDKITE_PULL_REQUEST_BASE_BRANCH -> $BUILDKITE_BRANCH
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=${VERSION} -Dtests.bwc.refspec.main=${BASE_COMMIT} bcUpgradeTest -Dtests.jvm.argline="-Des.serverless_transport=true"
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
preemptible: true
retry:
automatic:
- exit_status: "-1"
limit: 3
signal_reason: none
- signal_reason: agent_stop
limit: 3
EOF
1 change: 1 addition & 0 deletions modules/ingest-geoip/qa/full-cluster-restart/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-java-rest-test'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-java-rest-test'
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugin/inference/qa/rolling-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-java-rest-test'
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugin/security/qa/multi-cluster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-java-rest-test'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-java-rest-test'
Expand Down
1 change: 1 addition & 0 deletions x-pack/qa/full-cluster-restart/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-java-rest-test'
Expand Down