Merge #138240

138240: roachprod: set org name when creating license r=srosenberg a=DarrylWong OrganizationName is no longer used in newer versions, but needs to be set to preserve backwards compatibility on older versions, e.g. mixed version tests that might not use the latest predecessor. Fixes: #138144 Epic: none Release note: none Co-authored-by: DarrylWong <[email protected]>
cockroachdb · Jan 7, 2025 · 833fbe4 · 833fbe4
2 parents f620f96 + 69493e4
commit 833fbe4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/roachprod/install/cockroach.go b/pkg/roachprod/install/cockroach.go
@@ -1307,7 +1307,9 @@ func (c *SyncedCluster) maybeGenerateLicense(l *logger.Logger) string {
 	}
 	if res == "" {
 		res, _ = (&licenseccl.License{
-			Type:              licenseccl.License_Enterprise,
+			Type: licenseccl.License_Enterprise,
+			// OrganizationName needs to be set to preserve backwards compatibility.
+			OrganizationName:  "Cockroach Labs - Production Testing",
 			Environment:       licenseccl.Development,
 			ValidUntilUnixSec: timeutil.Now().AddDate(0, 1, 0).Unix(),
 		}).Encode()