recipe_modules: Rearrange RBE recipes

Group them by target OS and cluster

R=shinyak@google.com, tikuta@google.com, ukai@google.com, yyanagisawa@google.com

Bug: 913249
Change-Id: I831d00700f75cd5a2dee101a690586e47fdbca00
Reviewed-on: https://chromium-review.googlesource.com/c/1404815
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_goma.py b/scripts/slave/recipe_modules/chromium_tests/chromium_goma.py
index ad6d5ff..2350c45 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_goma.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_goma.py
@@ -149,6 +149,19 @@
        'platform': 'linux',
      },
    },
+   'Chromium Linux Goma RBE Prod': {
+     'chromium_config': 'chromium',
+     'chromium_apply_config': ['goma_rbe_prod', 'mb'],
+     'gclient_config': 'chromium',
+     'chromium_config_kwargs': {
+       'BUILD_CONFIG': 'Release',
+       'TARGET_BITS': 64,
+     },
+     'goma_staging': True,
+     'testing': {
+       'platform': 'linux',
+     },
+   },
    'Chromium Mac Goma RBE Staging': {
      'chromium_config': 'chromium',
      'chromium_apply_config': ['goma_rbe_staging', 'mb'],
@@ -204,18 +217,5 @@
        'platform': 'linux',
      },
    },
-   'Chromium Linux Goma RBE Prod': {
-     'chromium_config': 'chromium',
-     'chromium_apply_config': ['goma_rbe_prod', 'mb'],
-     'gclient_config': 'chromium',
-     'chromium_config_kwargs': {
-       'BUILD_CONFIG': 'Release',
-       'TARGET_BITS': 64,
-     },
-     'goma_staging': True,
-     'testing': {
-       'platform': 'linux',
-     },
-   },
  },
 }