Merge #54046 #54051 #54053

54046: roachtest: test with Django 3.1 r=rafiss a=rafiss fixes #53990 fixes #53948 fixes #53989 This fixes a test setup issue. Django 3.1 does not support CockroachDB 19.2, so we stop testing that version. Release justification: test only change Release note: None 54051: licenses: Update BSL change date for master/21.1 r=bdarnell a=nathanstilwell Release justification: updating BSL license after cutting release branch 20.2 Release note: None 54053: build: disable release justifications after release branch cut r=arulajmani a=nathanstilwell Release note: None Co-authored-by: Rafi Shamim <[email protected]> Co-authored-by: Nathan Stilwell <[email protected]>
cockroachdb · Sep 8, 2020 · 08d01e6 · 08d01e6
4 parents c84759b + a8749a1 + 186a625 + b4cd8ef
commit 08d01e6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 51 deletions.
diff --git a/build/teamcity-check.sh b/build/teamcity-check.sh
@@ -2,7 +2,7 @@
 
 # Set this to 1 to require a "release justification" note in the commit message
 # or the PR description.
-require_justification=1
+require_justification=0
 
 set -euo pipefail
 

diff --git a/githooks/commit-msg b/githooks/commit-msg
@@ -52,7 +52,7 @@ IFS='
 notes=($($grep -iE '^release note' "$1"))
 
 # Set this to 1 to require a release justification note.
-require_justification=1
+require_justification=0
 justification=($($grep -iE '^release justification: \S+' "$1"))
 
 IFS=$saveIFS

diff --git a/githooks/prepare-commit-msg b/githooks/prepare-commit-msg
@@ -2,7 +2,7 @@
 #
 # Prepare the commit message by adding a release note.
 
-require_justification=1
+require_justification=0
 set -euo pipefail
 
 if [[ "${2-}" = "message" ]]; then

diff --git a/licenses/BSL.txt b/licenses/BSL.txt
@@ -3,8 +3,8 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Cockroach Labs, Inc.
-Licensed Work:        CockroachDB 20.2
-                      The Licensed Work is (c) 2020 Cockroach Labs, Inc.
+Licensed Work:        CockroachDB 21.1
+                      The Licensed Work is (c) 2021 Cockroach Labs, Inc.
 Additional Use Grant: You may make use of the Licensed Work, provided that
                       you may not use the Licensed Work for a Database
                       Service.
@@ -15,7 +15,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that
                       Licensed Work by creating tables whose schemas are
                       controlled by such third parties.
 
-Change Date:          2023-10-01
+Change Date:          2024-04-01
 
 Change License:       Apache License, Version 2.0
 

diff --git a/pkg/cmd/roachtest/django.go b/pkg/cmd/roachtest/django.go
@@ -19,7 +19,7 @@ import (
 var djangoReleaseTagRegex = regexp.MustCompile(`^(?P<major>\d+)\.(?P<minor>\d+)(\.(?P<point>\d+))?$`)
 var djangoCockroachDBReleaseTagRegex = regexp.MustCompile(`^(?P<major>\d+)\.(?P<minor>\d+)$`)
 
-var djangoSupportedTag = "cockroach-3.0.x"
+var djangoSupportedTag = "cockroach-3.1.x"
 
 func registerDjango(r *testRegistry) {
 	runDjango := func(
@@ -205,7 +205,7 @@ func registerDjango(r *testRegistry) {
 	}
 
 	r.Add(testSpec{
-		MinVersion: "v19.2.0",
+		MinVersion: "v20.1.0",
 		Name:       "django",
 		Owner:      OwnerAppDev,
 		Cluster:    makeClusterSpec(1, cpu(16)),

diff --git a/pkg/cmd/roachtest/django_blocklist.go b/pkg/cmd/roachtest/django_blocklist.go
@@ -162,7 +162,6 @@ var enabledDjangoTests = []string{
 }
 
 var djangoBlocklists = blocklistsForVersion{
-	{"v19.2", "djangoBlocklist19_2", djangoBlocklist19_2, "djangoIgnoreList19_2", djangoIgnoreList19_2},
 	{"v20.1", "djangoBlocklist20_1", djangoBlocklist20_1, "djangoIgnoreList20_1", djangoIgnoreList20_1},
 	{"v20.2", "djangoBlocklist20_2", djangoBlocklist20_2, "djangoIgnoreList20_2", djangoIgnoreList20_2},
 }
@@ -172,50 +171,9 @@ var djangoBlocklist20_2 = blocklist{}
 
 var djangoBlocklist20_1 = blocklist{}
 
-var djangoBlocklist19_2 = blocklist{
-	// TODO (rohany): The postgres_tests suite within Django is not in a automatically
-	//  runnable state right now.
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_and_empty_result":                                 "41334",
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_and_general":                                      "41334",
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_and_on_only_false_values":                         "41334",
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_and_on_only_true_values":                          "41334",
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_or_empty_result":                                  "41334",
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_or_general":                                       "41334",
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_or_on_only_false_values":                          "41334",
-	//"postgres_tests.test_aggregates.TestGeneralAggregate.test_bit_or_on_only_true_values":                           "41334",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_corr_empty_result":                                 "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_corr_general":                                      "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_covar_pop_empty_result":                            "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_covar_pop_general":                                 "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_covar_pop_sample":                                  "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_covar_pop_sample_empty_result":                     "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_avgx_empty_result":                            "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_avgx_general":                                 "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_avgx_with_related_obj_and_number_as_argument": "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_avgy_empty_result":                            "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_avgy_general":                                 "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_count_empty_result":                           "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_count_general":                                "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_intercept_empty_result":                       "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_intercept_general":                            "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_r2_empty_result":                              "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_r2_general":                                   "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_slope_empty_result":                           "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_slope_general":                                "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_sxx_empty_result":                             "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_sxx_general":                                  "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_sxy_empty_result":                             "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_sxy_general":                                  "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_syy_empty_result":                             "41274",
-	//"postgres_tests.test_aggregates.TestStatisticsAggregate.test_regr_syy_general":                                  "41274",
-	//"postgres_tests.test_array.TestOtherTypesExactQuerying.test_exact_decimals":                                     "23468",
-}
-
 var djangoIgnoreList20_2 = djangoIgnoreList20_1
 
-var djangoIgnoreList20_1 = djangoIgnoreList19_2
-
-var djangoIgnoreList19_2 = blocklist{
+var djangoIgnoreList20_1 = blocklist{
 	"expressions.tests.BasicExpressionsTests.test_boolean_expression_combined":   "unknown",
 	"inspectdb.tests.InspectDBTestCase.test_attribute_name_not_python_keyword":   "unknown",
 	"inspectdb.tests.InspectDBTestCase.test_digits_column_name_introspection":    "unknown",