🏗 split the {beta,experimental} channels in versioning.json into {-…

…opt-in,-traffic} channels (#36800)
ampproject · Nov 5, 2021 · 2e1aed7 · 2e1aed7
1 parent e38c8d9
commit 2e1aed7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/build-system/global-configs/versioning.json b/build-system/global-configs/versioning.json
@@ -1,7 +1,9 @@
 {
-  "beta": "030000000000000",
+  "beta-opt-in": "030000000000000",
+  "beta-traffic": "030000000000000",
   "control": "020000000000000",
-  "experimental": "000000000000000",
+  "experimental-opt-in": "000000000000000",
+  "experimental-traffic": "000000000000000",
   "experimentA": null,
   "experimentB": null,
   "experimentC": null,

diff --git a/build-system/json-schemas/versioning.json b/build-system/json-schemas/versioning.json
@@ -3,9 +3,11 @@
   "description": "Versioning (RTV) information",
   "type": "object",
   "required": [
-    "beta",
+    "beta-opt-in",
+    "beta-traffic",
     "control",
-    "experimental",
+    "experimental-opt-in",
+    "experimental-traffic",
     "experimentA",
     "experimentB",
     "experimentC",
@@ -15,18 +17,10 @@
     "stable"
   ],
   "properties": {
-    "beta": {
-      "type": "string",
-      "pattern": "03\\d{13}"
-    },
     "control": {
       "type": "string",
       "pattern": "02\\d{13}"
     },
-    "experimental": {
-      "type": "string",
-      "pattern": "00\\d{13}"
-    },
     "experimentA": {
       "type": [
         "string",
@@ -48,19 +42,25 @@
       ],
       "pattern": "12\\d{13}"
     },
-    "lts": {
-      "type": "string",
-      "pattern": "01\\d{13}"
-    },
     "nightly": {
       "type": "string",
       "pattern": "04\\d{13}"
     },
     "nightly-control": {
       "type": "string",
       "pattern": "05\\d{13}"
+    }
+  },
+  "patternProperties": {
+    "beta-(opt-in|traffic)": {
+      "type": "string",
+      "pattern": "03\\d{13}"
+    },
+    "experimental-(opt-in|traffic)": {
+      "type": "string",
+      "pattern": "00\\d{13}"
     },
-    "stable": {
+    "(stable|lts)": {
       "type": "string",
       "pattern": "01\\d{13}"
     }