Merge remote-tracking branch 'origin/MFTF3.0.0-RC2' into MQE-2027-2

Author: jilu1

src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php

@@ -165,11 +165,7 @@ private function getFailedTestList()
                     if ($suiteName == self::DEFAULT_TEST_GROUP) {
                         array_push($failedTestDetails['tests'], $testName);
                     } else {
-                        // Trim potential suite_parallel_0 to suite_parallel
-                        $suiteNameArray = explode("_", $suiteName);
-                        if (is_numeric(array_pop($suiteNameArray))) {
-                            $suiteName = implode("_", $suiteNameArray);
-                        }
+                        $suiteName = $this->sanitizeSuiteName($suiteName);
                         $failedTestDetails['suites'] = array_merge_recursive(
                             $failedTestDetails['suites'],
                             [$suiteName => [$testName]]
@@ -191,6 +187,23 @@ private function getFailedTestList()
         return $testConfigurationJson;
     }
 
+    /**
+     * Trim potential suite_parallel_0_G to suite_parallel
+     *
+     * @param string $suiteName
+     * @return string
+     */
+    private function sanitizeSuiteName($suiteName)
+    {
+        $suiteNameArray = explode("_", $suiteName);
+        if (array_pop($suiteNameArray) == 'G') {
+            if (is_numeric(array_pop($suiteNameArray))) {
+                $suiteName = implode("_", $suiteNameArray);
+            }
+        }
+        return $suiteName;
+    }
+
     /**
      * Returns an array of run commands read from the manifest file created post generation
      *