Skip to content
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

test: re-enable backwards compat tests #19521

Merged
merged 3 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1438,10 +1438,10 @@ script = '''
UPDATE_EXPECT=1 cargo test -p risingwave_connector tests::test_with_options_yaml_up_to_date
'''

#[tasks.backwards-compat-test]
#category = "RiseDev - Test - Backwards Compatibility Test"
#description = "Run backwards compatibility test"
#script = "./e2e_test/backwards-compat-tests/scripts/run_local.sh"
[tasks.backwards-compat-test]
category = "RiseDev - Test - Backwards Compatibility Test"
description = "Run backwards compatibility test"
script = "./e2e_test/backwards-compat-tests/scripts/run_local.sh"

# For debugging.
# To show the env for a specific task, use `run_task = "show-env"` for that task.
Expand Down
10 changes: 5 additions & 5 deletions ci/scripts/backwards-compat-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ echo "--- Setting up cluster config"
full-without-monitoring:
steps:
- use: minio
- use: etcd
- use: sqlite
- use: meta-node
- use: compute-node
- use: frontend
- use: compactor
EOF
else
# For versions >= 1.9.0, the default config will default to sql backend,
# breaking backwards compat, so we must specify meta-backend: etcd
# For versions >= 1.9.0, we have support for different sql meta-backend,
# so we need to specify the meta-backend: sqlite
cat <<EOF > risedev-profiles.user.yml
full-without-monitoring:
steps:
- use: minio
- use: etcd
- use: sqlite
- use: meta-node
meta-backend: etcd
meta-backend: sqlite
- use: compute-node
- use: frontend
- use: compactor
Expand Down
68 changes: 34 additions & 34 deletions ci/workflows/main-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -615,40 +615,40 @@ steps:
timeout_in_minutes: 5

# Backwards compatibility tests
# - label: "Backwards compatibility tests version_offset={{matrix.version_offset}}"
# key: "backwards-compat-tests"
# command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-release"
# if: |
# !(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
# || build.pull_request.labels includes "ci/run-backwards-compat-tests"
# || build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
# depends_on:
# - "build"
# plugins:
# - docker-compose#v5.1.0:
# run: source-test-env
# config: ci/docker-compose.yml
# mount-buildkite-agent: true
# environment:
# - BUILDKITE_BRANCH
# - ./ci/plugins/upload-failure-logs
# matrix:
# setup:
# # Test the 4 latest versions against the latest main.
# # e.g.
# # 1: 2.0.0
# # 2: 1.1.1
# # 3: 1.0.1
# # 4: 1.0.0
# # It is ordered by the full version number, rather than minor / major version.
# # We can change to just be on major version in the future.
# version_offset:
# - "1"
# - "2"
# - "3"
# - "4"
# timeout_in_minutes: 30
# retry: *auto-retry
- label: "Backwards compatibility tests version_offset={{matrix.version_offset}}"
key: "backwards-compat-tests"
command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-release"
if: |
!(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
|| build.pull_request.labels includes "ci/run-backwards-compat-tests"
|| build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
depends_on:
- "build"
plugins:
- docker-compose#v5.1.0:
run: source-test-env
config: ci/docker-compose.yml
mount-buildkite-agent: true
environment:
- BUILDKITE_BRANCH
- ./ci/plugins/upload-failure-logs
matrix:
setup:
# Test the 4 latest versions against the latest main.
# e.g.
# 1: 2.0.0
# 2: 1.1.1
# 3: 1.0.1
# 4: 1.0.0
# It is ordered by the full version number, rather than minor / major version.
# We can change to just be on major version in the future.
version_offset:
- "1"
- "2"
- "3"
- "4"
timeout_in_minutes: 30
retry: *auto-retry

# Sqlsmith differential testing
- label: "Sqlsmith Differential Testing"
Expand Down
65 changes: 32 additions & 33 deletions ci/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -698,39 +698,38 @@ steps:
timeout_in_minutes: 60 # ~3-4 queries can run

# Backwards compatibility tests
# TODO: support backwards compatibility tests for sql backend
# - label: "Backwards compatibility tests"
# command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-dev"
# if: |
# build.pull_request.labels includes "breaking-change" ||
# build.pull_request.labels includes "ci/run-backwards-compat-tests" ||
# build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
# depends_on:
# - "build"
# plugins:
# - docker-compose#v5.1.0:
# run: source-test-env
# config: ci/docker-compose.yml
# mount-buildkite-agent: true
# environment:
# - BUILDKITE_BRANCH
# - ./ci/plugins/upload-failure-logs
# matrix:
# setup:
# # Test the 4 latest versions against the latest main.
# # e.g.
# # 1: 2.0.0
# # 2: 1.1.1
# # 3: 1.0.1
# # 4: 1.0.0
# # It is ordered by the full version number, rather than minor / major version.
# # We can change to just be on major version in the future.
# version_offset:
# - "1"
# - "2"
# - "3"
# - "4"
# timeout_in_minutes: 25
- label: "Backwards compatibility tests"
command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-dev"
if: |
build.pull_request.labels includes "breaking-change" ||
build.pull_request.labels includes "ci/run-backwards-compat-tests" ||
build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
depends_on:
- "build"
plugins:
- docker-compose#v5.1.0:
run: source-test-env
config: ci/docker-compose.yml
mount-buildkite-agent: true
environment:
- BUILDKITE_BRANCH
- ./ci/plugins/upload-failure-logs
matrix:
setup:
# Test the 4 latest versions against the latest main.
# e.g.
# 1: 2.0.0
# 2: 1.1.1
# 3: 1.0.1
# 4: 1.0.0
# It is ordered by the full version number, rather than minor / major version.
# We can change to just be on major version in the future.
version_offset:
- "1"
- "2"
- "3"
- "4"
timeout_in_minutes: 25

# Sqlsmith differential testing
- label: "Sqlsmith Differential Testing"
Expand Down
Loading