Skip to content

Commit 3693763

Browse files
craig[bot]railKeithChrafiss
committed
152848: release: fix docker image verification with telemetry disabled r=celiala a=rail This commit fixes the verification of the FIPS docker image when telemetry is disabled. Epic: none Release note: none 152850: changefeedccl: ignore context canceled error in tests r=andyyang890 a=KeithCh Context canceled errors is causing flakes in tests, and should be ignored. Fixes: #151726 #152510 Release note: None 152856: roachtest: create required test schemas for SQLAlchemy test suite r=rafiss a=rafiss fixes #152780 fixes #152779 fixes #152778 fixes #152775 fixes #152773 Release note: None Co-authored-by: Rail Aliiev <[email protected]> Co-authored-by: Keith Chow <[email protected]> Co-authored-by: Rafi Shamim <[email protected]>
4 parents 3aad29a + 16bbe95 + 59221d2 + 7f054a0 commit 3693763

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

build/teamcity/internal/release/process/build-cockroach-release-per-platform.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@ fi
118118
# Here we verify the FIPS image only. The multi-arch image will be verified in the job it's created.
119119
if [[ $platform == "linux-amd64-fips" ]]; then
120120
tc_start_block "Verify FIPS docker image"
121-
verify_docker_image "$build_docker_tag" "linux/amd64" "$BUILD_VCS_NUMBER" "$version" true false
121+
verify_docker_image "$build_docker_tag" "linux/amd64" "$BUILD_VCS_NUMBER" "$version" true $telemetry_disabled
122122
tc_end_block "Verify FIPS docker image"
123123
fi

pkg/ccl/changefeedccl/helpers_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,7 @@ func requireNoFeedsFail(t *testing.T) (fn updateKnobsFn) {
938938
`connection reset by peer`,
939939
`knobs.RaiseRetryableError`,
940940
`test error`,
941+
`context canceled`,
941942
}
942943
shouldIgnoreErr := func(err error) bool {
943944
if err == nil || errors.Is(err, context.Canceled) {

pkg/cmd/roachtest/tests/sqlalchemy.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,22 @@ func runSQLAlchemy(ctx context.Context, t test.Test, c cluster.Cluster) {
128128
t.Fatal(err)
129129
}
130130

131+
// The test suite requires two schemas to be created ahead of time.
132+
// See https://github.com/sqlalchemy/sqlalchemy/blob/b3feb9cd3e87960ee65968b712e73d8464385a4a/README.unittests.rst?plain=1#L139.
133+
db, err := c.ConnE(ctx, t.L(), node[0], option.DBName("defaultdb"))
134+
if err != nil {
135+
t.Fatal(err)
136+
}
137+
defer db.Close()
138+
for _, cmd := range []string{
139+
`CREATE SCHEMA IF NOT EXISTS test_schema`,
140+
`CREATE SCHEMA IF NOT EXISTS test_schema_2`,
141+
} {
142+
if _, err := db.ExecContext(ctx, cmd); err != nil {
143+
t.Fatal(err)
144+
}
145+
}
146+
131147
blocklistName, expectedFailures := "sqlAlchemyBlocklist", sqlAlchemyBlocklist
132148
ignoredlistName, ignoredlist := "sqlAlchemyIgnoreList", sqlAlchemyIgnoreList
133149
t.L().Printf("Running cockroach version %s, using blocklist %s, using ignoredlist %s",

0 commit comments

Comments
 (0)