Merge pull request #63479 from rafiss/backport21.1-63154

release-21.1: roachtest: upgrade ORM versions under test

pkg/cmd/roachtest/activerecord.go

@@ -21,7 +21,7 @@ import (
 var activerecordResultRegex = regexp.MustCompile(`^(?P<test>[^\s]+#[^\s]+) = (?P<timing>\d+\.\d+ s) = (?P<result>.)$`)
 var railsReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)\.?(?P<subpoint>\d*)$`)
 var supportedRailsVersion = "6.1"
-var adapterVersion = "v6.1.0-beta.2"
+var activerecordAdapterVersion = "v6.1.0-beta.3"
 
 // This test runs activerecord's full test suite against a single cockroach node.
 
@@ -81,7 +81,7 @@ func registerActiveRecord(r *testRegistry) {
 		}
 		c.l.Printf("Latest rails release is %s.", latestTag)
 		c.l.Printf("Supported rails release is %s.", supportedRailsVersion)
-		c.l.Printf("Supported adapter version is %s.", adapterVersion)
+		c.l.Printf("Supported adapter version is %s.", activerecordAdapterVersion)
 
 		if err := repeatRunE(
 			ctx, c, node, "update apt-get", `sudo apt-get -qq update`,
@@ -125,7 +125,7 @@ func registerActiveRecord(r *testRegistry) {
 			c,
 			"https://github.com/cockroachdb/activerecord-cockroachdb-adapter.git",
 			"/mnt/data1/activerecord-cockroachdb-adapter",
-			adapterVersion,
+			activerecordAdapterVersion,
 			node,
 		); err != nil {
 			t.Fatal(err)

pkg/cmd/roachtest/django.go

@@ -19,7 +19,8 @@ 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.1.x"
+var djangoSupportedTag = "cockroach-3.2.x"
+var djangoCockroachDBSupportedTag = "3.2"
 
 func registerDjango(r *testRegistry) {
 	runDjango := func(
@@ -126,14 +127,15 @@ func registerDjango(r *testRegistry) {
 			t.Fatal(err)
 		}
 		c.l.Printf("Latest django-cockroachdb release is %s.", djangoCockroachDBLatestTag)
+		c.l.Printf("Supported django-cockroachdb release is %s.", djangoCockroachDBSupportedTag)
 
 		if err := repeatGitCloneE(
 			ctx,
 			t.l,
 			c,
 			"https://github.com/cockroachdb/django-cockroachdb",
 			"/mnt/data1/django/tests/django-cockroachdb",
-			"master",
+			djangoCockroachDBSupportedTag,
 			node,
 		); err != nil {
 			t.Fatal(err)

pkg/cmd/roachtest/gopg.go

@@ -24,7 +24,7 @@ import (
 
 // Currently, we're running a version like 'v9.0.1'.
 var gopgReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)(?:\.(?P<minor>\d+)(?:\.(?P<point>\d+))?)?$`)
-var gopgSupportedTag = "v10.0.1"
+var gopgSupportedTag = "v10.9.0"
 
 // This test runs gopg full test suite against a single cockroach node.
 func registerGopg(r *testRegistry) {

pkg/cmd/roachtest/libpq.go

@@ -17,6 +17,7 @@ import (
 )
 
 var libPQReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)$`)
+var libPQSupportedTag = "v1.10.0"
 
 func registerLibPQ(r *testRegistry) {
 	runLibPQ := func(ctx context.Context, t *test, c *cluster) {
@@ -42,6 +43,7 @@ func registerLibPQ(r *testRegistry) {
 			t.Fatal(err)
 		}
 		c.l.Printf("Latest lib/pq release is %s.", latestTag)
+		c.l.Printf("Supported lib/pq release is %s.", libPQSupportedTag)
 
 		installLatestGolang(ctx, t, c, node)
 
@@ -73,7 +75,7 @@ func registerLibPQ(r *testRegistry) {
 			c,
 			fmt.Sprintf("https://%s.git", libPQRepo),
 			libPQPath,
-			latestTag,
+			libPQSupportedTag,
 			node,
 		); err != nil {
 			t.Fatal(err)

pkg/cmd/roachtest/pgjdbc.go

@@ -17,7 +17,7 @@ import (
 )
 
 var pgjdbcReleaseTagRegex = regexp.MustCompile(`^REL(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)$`)
-var supportedPGJDBCTag = "REL42.2.9"
+var supportedPGJDBCTag = "REL42.2.19"
 
 // This test runs pgjdbc's full test suite against a single cockroach node.
 
@@ -54,6 +54,7 @@ func registerPgjdbc(r *testRegistry) {
 			t.Fatal(err)
 		}
 		c.l.Printf("Latest pgjdbc release is %s.", latestTag)
+		c.l.Printf("Supported pgjdbc release is %s.", supportedPGJDBCTag)
 
 		if err := repeatRunE(
 			ctx, c, node, "update apt-get", `sudo apt-get -qq update`,
@@ -66,7 +67,7 @@ func registerPgjdbc(r *testRegistry) {
 			c,
 			node,
 			"install dependencies",
-			`sudo apt-get -qq install default-jre openjdk-8-jdk-headless maven`,
+			`sudo apt-get -qq install default-jre openjdk-11-jdk-headless maven`,
 		); err != nil {
 			t.Fatal(err)
 		}
@@ -113,7 +114,7 @@ func registerPgjdbc(r *testRegistry) {
 			c,
 			node,
 			"building pgjdbc (without tests)",
-			`cd /mnt/data1/pgjdbc/pgjdbc/ && mvn -Dtest=OidToStringTest test`,
+			`cd /mnt/data1/pgjdbc/pgjdbc/ && ../gradlew test --tests OidToStringTest`,
 		); err != nil {
 			t.Fatal(err)
 		}
@@ -133,7 +134,7 @@ func registerPgjdbc(r *testRegistry) {
 		// Note that this is expected to return an error, since the test suite
 		// will fail. And it is safe to swallow it here.
 		_ = c.RunE(ctx, node,
-			`cd /mnt/data1/pgjdbc/pgjdbc/ && mvn test`,
+			`cd /mnt/data1/pgjdbc/pgjdbc/ && ../gradlew test`,
 		)
 
 		_ = c.RunE(ctx, node,
@@ -150,7 +151,7 @@ func registerPgjdbc(r *testRegistry) {
 			c,
 			node,
 			"copy test result files",
-			`cp /mnt/data1/pgjdbc/pgjdbc/target/surefire-reports ~/logs/report/pgjdbc-results -a`,
+			`cp /mnt/data1/pgjdbc/pgjdbc/build/test-results/test/ ~/logs/report/pgjdbc-results -a`,
 		); err != nil {
 			t.Fatal(err)
 		}
@@ -163,7 +164,7 @@ func registerPgjdbc(r *testRegistry) {
 			t.l,
 			node,
 			"get list of test files",
-			`ls /mnt/data1/pgjdbc/pgjdbc/target/surefire-reports/*.xml`,
+			`ls /mnt/data1/pgjdbc/pgjdbc/build/test-results/test/*.xml`,
 		)
 		if err != nil {
 			t.Fatal(err)
@@ -179,7 +180,7 @@ func registerPgjdbc(r *testRegistry) {
 	}
 
 	r.Add(testSpec{
-		MinVersion: "v2.1.0",
+		MinVersion: "v20.1.0",
 		Name:       "pgjdbc",
 		Owner:      OwnerSQLExperience,
 		Cluster:    makeClusterSpec(1),