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.

Sign up for GitHub

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

ci: fix bazci commands for corpus generation #87218

Merged
merged 1 commit into from
Sep 1, 2022
Merged

ci: fix bazci commands for corpus generation #87218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ exit_status=0

# Generate a corpus for all non-mixed version variants
for config in local multiregion-9node-3region-3azs; do
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci -- --config=ci \
test //pkg/sql/logictest/tests/$config/... \
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
//pkg/sql/logictest/tests/$config/... \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus \
--test_env=GO_TEST_WRAP_TESTV=1 \
--test_env=GO_TEST_WRAP=1 \
Expand All @@ -44,8 +44,8 @@ process_test_json \
done

for config in local multiregion-9node-3region-3azs multiregion-9node-3region-3azs-no-los multiregion-9node-3region-3azs-tenant multiregion-9node-3region-3azs-vec-off multiregion-15node-5region-3azs 3node-tenant 3node-tenant-multiregion; do
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci --config=ci \
test //pkg/ccl/logictestccl/tests/$config/... -- \
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
//pkg/ccl/logictestccl/tests/$config/... \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus \
--test_env=GO_TEST_WRAP_TESTV=1 \
--test_env=GO_TEST_WRAP=1 \
Expand All @@ -62,8 +62,8 @@ process_test_json \
done

# Generate corpuses from end-to-end-schema changer tests
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci --config=ci \
test //pkg/sql/schemachanger:schemachanger_test -- \
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
//pkg/sql/schemachanger:schemachanger_test \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus \
--test_filter='^TestGenerateCorpus.*$' \
--test_env=GO_TEST_WRAP_TESTV=1 \
Expand All @@ -80,8 +80,8 @@ $GO_TEST_GEN_JSON_OUTPUT_FILE \
$exit_status

# Generate corpuses from end-to-end-schema changer tests
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci --config=ci \
test //pkg/ccl/schemachangerccl:schemachangerccl_test -- \
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
//pkg/ccl/schemachangerccl:schemachangerccl_test \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus \
--test_filter='^TestGenerateCorpus.*$' \
--test_env=GO_TEST_WRAP_TESTV=1 \
Expand All @@ -100,8 +100,8 @@ $exit_status

# Any generated corpus should be validated on the current version first, which
# indicates we can replay it on the same version.
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci --config=ci \
test //pkg/sql/schemachanger/corpus:corpus_test -- \
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
//pkg/sql/schemachanger/corpus:corpus_test \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus \
--test_filter='^TestValidateCorpuses$' \
--test_env=GO_TEST_WRAP_TESTV=1 \
Expand All @@ -124,8 +124,8 @@ fi

# Generate a corpus for all mixed version variants
for config in local-mixed-22.1-22.2; do
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci --config=ci \
test //pkg/sql/logictest/tests/$config/... -- \
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
//pkg/sql/logictest/tests/$config/... \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus-mixed\
--test_env=GO_TEST_WRAP_TESTV=1 \
--test_env=GO_TEST_WRAP=1 \
Expand All @@ -143,8 +143,8 @@ done

# Any generated corpus should be validated on the current version first, which
# indicates we can replay it on the same version.
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci --config=ci \
test //pkg/sql/schemachanger/corpus:corpus_test -- \
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test --config=ci \
//pkg/sql/schemachanger/corpus:corpus_test \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus-mixed \
--test_filter='^TestValidateCorpuses$' \
--test_env=GO_TEST_WRAP_TESTV=1 \
Expand Down