Add PR upgrade tests from merge base to PR HEAD #128823
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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}-SNAPSHOT -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: | ||
|
There was a problem hiding this comment. as previously said. I think we should remove this retry logic for now There was a problem hiding this comment. If we remove the retry logic then we need to remove |
||
| automatic: | ||
| - exit_status: "-1" | ||
| limit: 3 | ||
| signal_reason: none | ||
| - signal_reason: agent_stop | ||
| limit: 3 | ||
| EOF | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If someone cuts their branch from say, version 9.1.0 and then merge in upstream changes that include a version bump to 9.1.1, what's the merge base? Will the delta include the version bump? If so, we should skip the tests in that scenario like we do on intake since we don't want to test upgrades across versions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And when I say "merge" upstream changes I mean exactly that. A merge, not a rebase.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was wondering the same and did a bit of testing, the merge base seems to be moved accordingly after such a refresh merge.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if someone doesn't refresh and their base branch got bumped eventually?
Should the test fail, asking for a refresh? I could get the version of the base commit from github and compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we're all good so long as the versions match.