Merge #40609 #40617 #40619

40609: roachtest: update 19.1 hibernate blacklist r=rafiss a=rafiss

The blacklist had too many expected failures. Most of them were related
to earlier issues with the test being unable to connect to the cluster. Also, remove
the `--info` option from the test runner command, since it makes too much output.

touches #40538

Release note: None

40617: opt: fix scalar building error handling r=RaduBerinde a=RaduBerinde

We are incorrectly returning `nil` error in an error case. This leads
to an assertion error instead of a "could not decorrelate subquery"
error.

Fixes #40590.

Release note: None

40619: cliccl: Change license acquisition URL r=rohany a=rohany

Change the cockroach demo license acquisition URLs to point to a new URL.

Release note: None

Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>
Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
Co-authored-by: Rohan Yadav <rohany@cockroachlabs.com>

pkg/ccl/cliccl/demo.go

@@ -22,9 +22,8 @@ import (
 	"github.com/cockroachdb/errors"
 )
 
-// TODO (rohany): change this once another endpoint is setup for getting licenses.
-// This URL grants a license that is valid for 1 hour.
-const licenseURL = "https://register.cockroachdb.com/api/prodtest"
+// This URL grants a license that is valid for 24 hours.
+const licenseURL = "https://register.cockroachdb.com/api/license"
 
 func getLicense(clusterID uuid.UUID) (string, error) {
 	client := &http.Client{
@@ -36,7 +35,8 @@ func getLicense(clusterID uuid.UUID) (string, error) {
 	}
 	// Send some extra information to the endpoint.
 	q := req.URL.Query()
-	q.Add("type", "demo")
+	// Let the endpoint know we are requesting a demo license.
+	q.Add("kind", "demo")
 	q.Add("version", build.VersionPrefix())
 	q.Add("clusterid", clusterID.String())
 	req.URL.RawQuery = q.Encode()

pkg/cli/demo.go

@@ -61,7 +61,7 @@ environment variable "COCKROACH_SKIP_ENABLING_DIAGNOSTIC_REPORTING".
 	}),
 }
 
-const demoOrg = "Cockroach Labs - Production Testing"
+const demoOrg = "Cockroach Demo"
 
 const defaultGeneratorName = "movr"
 

pkg/cmd/roachtest/hibernate.go

@@ -129,7 +129,7 @@ func registerHibernate(r *testRegistry) {
 		// Also 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/hibernate/hibernate-core/ && ./../gradlew test -Pdb=cockroach --info`,
+			`cd /mnt/data1/hibernate/hibernate-core/ && ./../gradlew test -Pdb=cockroach`,
 		)
 
 		t.Status("collecting the test results")