[iOS][code coverage] Run iOS CQ suites in iOS coverage builder.

iOS coverage builder should run the same tests in the same variants as
CQ builders. This change aligned the tests. Also added comment lines to
remind people keeping them in sync and fixed a typo.

Bug: 1090188
Change-Id: Iabd33a1226550ab1a26bc2613f8e707a56f942ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469617Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817227}

testing/buildbot/test_suites.pyl

@@ -5748,31 +5748,35 @@
       }
     },
 
+    # This suite is a union of ios_simulator_tests and
+    # ios_simulator_full_configs_tests.
     'ios_code_coverage_tests': {
       'ios_common_tests': {
         'variants': [
-          'SIM_IPHONE_6S_12_4',
           'SIM_IPHONE_6S_13_6',
+          'SIM_IPHONE_6S_14_0',
         ],
       },
       'ios_eg2_cq_tests': {
         'mixins': ['xcode_parallelization'],
         'variants': [
-          'SIM_IPHONE_6S_12_4',
-          'SIM_IPAD_AIR_2_12_4',
           'SIM_IPHONE_6S_13_6',
           'SIM_IPHONE_7_13_6',
           'SIM_IPAD_AIR_2_13_6',
+          'SIM_IPHONE_6S_14_0',
+          'SIM_IPHONE_7_14_0',
+          'SIM_IPAD_AIR_2_14_0',
         ],
       },
       'ios_eg2_tests': {
         'mixins': ['xcode_parallelization'],
         'variants': [
-          'SIM_IPAD_AIR_2_12_4',
-          'SIM_IPHONE_X_12_4',
           'SIM_IPHONE_7_13_6',
           'SIM_IPAD_AIR_2_13_6',
           'SIM_IPHONE_X_13_6',
+          'SIM_IPHONE_7_14_0',
+          'SIM_IPAD_AIR_2_14_0',
+          'SIM_IPHONE_X_14_0',
         ],
       },
       'ios_screen_size_dependent_tests': {
@@ -5780,7 +5784,11 @@
           'SIM_IPHONE_6S_PLUS_13_6',
           'SIM_IPHONE_6S_13_6',
           'SIM_IPHONE_SE_1ST_GEN_13_6',
-          'SIM_IPAD_AIR_2_13_6'
+          'SIM_IPAD_AIR_2_13_6',
+          'SIM_IPHONE_6S_PLUS_14_0',
+          'SIM_IPHONE_6S_14_0',
+          'SIM_IPHONE_SE_1ST_GEN_14_0',
+          'SIM_IPAD_AIR_2_14_0',
         ],
       },
     },
@@ -5794,7 +5802,8 @@
       }
     },
 
-    'ios_simulator_full_configs_test': {
+    # Please also change ios_code_coverage_tests for any change in this suite.
+    'ios_simulator_full_configs_tests': {
       'ios_eg2_tests': {
         'mixins': ['xcode_parallelization'],
         'variants': [
@@ -5870,6 +5879,7 @@
       },
     },
 
+    # Please also change ios_code_coverage_tests for any change in this suite.
     'ios_simulator_tests': {
       'ios_common_tests': {
         'variants': [

testing/buildbot/waterfalls.pyl

@@ -4761,7 +4761,7 @@
           'xctest',
         ],
         'test_suites': {
-          'isolated_scripts': 'ios_simulator_full_configs_test'
+          'isolated_scripts': 'ios_simulator_full_configs_tests'
         },
       },
       'ios-simulator-noncq': {