diff --git a/pkg/cmd/roachtest/django.go b/pkg/cmd/roachtest/django.go index a6a196f366b7..30cafac9d39c 100644 --- a/pkg/cmd/roachtest/django.go +++ b/pkg/cmd/roachtest/django.go @@ -20,7 +20,7 @@ var djangoReleaseTagRegex = regexp.MustCompile(`^(?P\d+)\.(?P\d+)\ var djangoCockroachDBReleaseTagRegex = regexp.MustCompile(`^(?P\d+)\.(?P\d+)$`) var djangoSupportedTag = "3.0.6" -var djangoCockroachDBSupportedTag = "3.0" +var djangoCockroachDBSupportedTag = "3.0.1" func registerDjango(r *testRegistry) { runDjango := func( @@ -112,9 +112,9 @@ func registerDjango(r *testRegistry) { ctx, t.l, c, - "https://github.com/django/django/", + "https://github.com/timgraham/django/", "/mnt/data1/django", - djangoSupportedTag, + "cockroach-3.0.x", node, ); err != nil { t.Fatal(err) @@ -202,8 +202,7 @@ func registerDjango(r *testRegistry) { results := newORMTestsResults() results.parsePythonUnitTestOutput(fullTestResults, expectedFailureList, ignoredlist) results.summarizeAll( - t, "django" /* ormName */, blocklistName, - expectedFailureList, version, djangoLatestTag, + t, "django" /* ormName */, blocklistName, expectedFailureList, version, djangoSupportedTag, ) } diff --git a/pkg/cmd/roachtest/django_blocklist.go b/pkg/cmd/roachtest/django_blocklist.go index bd465f57d101..d7e0610b6c22 100644 --- a/pkg/cmd/roachtest/django_blocklist.go +++ b/pkg/cmd/roachtest/django_blocklist.go @@ -15,8 +15,6 @@ package main // in alphabetical order. As more progress is made with adding compatibility, // more test apps should be added here to prevent against regression. var enabledDjangoTests = []string{ - "app_loading", - "apps", "admin_changelist", "admin_custom_urls", "admin_docs", @@ -30,8 +28,6 @@ var enabledDjangoTests = []string{ "annotations", "auth_tests", "backends", - "base", - "bash_completion", "basic", "bulk_create", "cache",