Sync platforms.thrift

Summary: Brings in support for grandcanyon2 and deprecated minipack3n

Test Plan: #DoItLive

Reviewed By: jamesatha

Differential Revision: D90698553

fbshipit-source-id: 6011419f6ccc3bab7c2d15140720baeffefcbe84

Author: amithash

.jfconfig

@@ -763,6 +763,40 @@
                 "openbmc_git"
             ]
         },
+        {
+            "alias": "openbmc-cit-grandcanyon2-determinator",
+            "args": {
+                "name": "openbmc-cit-grandcanyon2-determinator",
+                "oncall": "openbmc",
+                "steps": [
+                    {
+                        "determinator": true,
+                        "name": "openbmc-cit-grandcanyon2-determinator",
+                        "shell": "facebook/sandcastle/job.py cit-diff --platform grandcanyon2"
+                    }
+                ]
+            },
+            "capabilities": {
+                "tenant": "openbmc",
+                "type": "lego",
+                "vcs": "openbmc-git"
+            },
+            "command": "SandcastleUniversalCommand",
+            "description": "Yocto diff listener",
+            "jellyfish_conditions": [
+                {
+                    "type": "some_file_matches_some_regexp",
+                    "value": [
+                        "^meta-facebook/meta-grandcanyon/meta-grandcanyon2/.*",
+                        "^meta-facebook/meta-grandcanyon/recipes-.*"
+                    ]
+                }
+            ],
+            "scheduleType": "diff",
+            "tags": [
+                "openbmc_git"
+            ]
+        },
         {
             "alias": "openbmc-cit-grandteton-determinator",
             "args": {
@@ -1164,39 +1198,6 @@
                 "openbmc_git"
             ]
         },
-        {
-            "alias": "openbmc-cit-minipack3n-determinator",
-            "args": {
-                "name": "openbmc-cit-minipack3n-determinator",
-                "oncall": "openbmc",
-                "steps": [
-                    {
-                        "determinator": true,
-                        "name": "openbmc-cit-minipack3n-determinator",
-                        "shell": "facebook/sandcastle/job.py cit-diff --platform minipack3n"
-                    }
-                ]
-            },
-            "capabilities": {
-                "tenant": "openbmc",
-                "type": "lego",
-                "vcs": "openbmc-git"
-            },
-            "command": "SandcastleUniversalCommand",
-            "description": "Yocto diff listener",
-            "jellyfish_conditions": [
-                {
-                    "type": "some_file_matches_some_regexp",
-                    "value": [
-                        "^meta-facebook/meta-minipack3n/.*"
-                    ]
-                }
-            ],
-            "scheduleType": "diff",
-            "tags": [
-                "openbmc_git"
-            ]
-        },
         {
             "alias": "openbmc-cit-montblanc-determinator",
             "args": {

tests2/utils/platforms.py

@@ -19,6 +19,7 @@
     "fby35",
     "fuji",
     "grandcanyon",
+    "grandcanyon2",
     "grandteton",
     "greatlakes",
     "gtartemis",
@@ -31,7 +32,6 @@
     "meru",
     "minerva",
     "minipack",
-    "minipack3n",
     "montblanc",
     "morgan800cc",
     "northdome",

tools/flashy/flash_procedure/flash_procedure_mappings.go

@@ -30,6 +30,7 @@ var GeneratedFlashProcedureMappings = map[string]func(step.StepParams) step.Step
 	"fby35":            flash.FlashCpVboot,
 	"fby3":             flash.FlashCpVboot,
 	"fuji":             flash.FlashCp,
+	"grandcanyon2":     flash.FlashCpVboot,
 	"grandcanyon":      flash.FlashCpVboot,
 	"grandteton":       flash.FlashCpVboot,
 	"greatlakes":       flash.FlashCpVboot,
@@ -42,7 +43,6 @@ var GeneratedFlashProcedureMappings = map[string]func(step.StepParams) step.Step
 	"lightning":        flash.FlashCp,
 	"meru":             flash.FlashCp,
 	"minerva":          flash.FlashCp,
-	"minipack3n":       flash.FlashCp,
 	"minipack":         flash.FlashCp,
 	"montblanc":        flash.FlashCp,
 	"morgan800cc":      flash.FlashCp,

tools/platforms/platform_build_names

@@ -19,6 +19,7 @@
   "fby35",
   "fuji",
   "grandcanyon",
+  "grandcanyon2",
   "grandteton",
   "greatlakes",
   "gtartemis",
@@ -31,7 +32,6 @@
   "meru",
   "minerva",
   "minipack",
-  "minipack3n",
   "montblanc",
   "morgan800cc",
   "northdome",