From 9cc413d9ba32125d4433ef4d8c2aa70eb667d682 Mon Sep 17 00:00:00 2001
From: Jackie Johnson <107960801+jjSDET@users.noreply.github.com>
Date: Mon, 25 Sep 2023 03:08:41 -0500
Subject: [PATCH] Refactor MTE-1595 [v119] Cleanup Debug Code from Firebase
 Perfherder Ingest Work (#16551)

* remove perfherder ingest debug code

* enable tab perf tests

* change firebase perf testing device

* retrigger github checks
---
 Tests/PerformanceTestPlan.xctestplan |  2 --
 bitrise.yml                          | 34 +++++-----------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/Tests/PerformanceTestPlan.xctestplan b/Tests/PerformanceTestPlan.xctestplan
index 0d2a659d95b0..bd708b01d5b6 100644
--- a/Tests/PerformanceTestPlan.xctestplan
+++ b/Tests/PerformanceTestPlan.xctestplan
@@ -53,8 +53,6 @@
         "NoImageTests",
         "OnboardingTests",
         "OpeningScreenTests",
-        "PerformanceTests\/testPerfTabs_3_20tabTray()",
-        "PerformanceTests\/testPerfTabs_4_1280tabTray()",
         "PhotonActionSheetTest",
         "PocketTest",
         "PrivateBrowsingTest",
diff --git a/bitrise.yml b/bitrise.yml
index bf0226d86907..56209c3293a9 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -1494,7 +1494,6 @@ workflows:
                 -sdk iphoneos \
                 -destination "generic/platform=iOS" \
                 -derivedDataPath "/Users/vagrant/git/DerivedData"
-    - deploy-to-bitrise-io@2: {}
     - script@1.1:
         title: Create .zip artifact for Firebase Testing
         inputs:
@@ -1507,7 +1506,6 @@ workflows:
             cd DerivedData/Build/Products
             zip -r Fennec_Enterprise.zip Fennec_Enterprise-iphoneos Fennec_Enterprise_PerformanceTestPlan_iphoneos16.4-arm64.xctestrun
             mv Fennec_Enterprise.zip /Users/vagrant/git/Fennec_Enterprise.zip
-    - deploy-to-bitrise-io@2: {}
     - cache-pull@2.7.2:
         inputs:
         - cache_paths: "$HOME/google-cloud-sdk"
@@ -1540,8 +1538,8 @@ workflows:
             TIMESTAMP=$(date "+%Y%m%d%H%M%S")
             RESULTS_DIR="firefox_ios_performance_tests_$TIMESTAMP"
             GOOGLE_CLOUD_BUCKET="firefox_ios_test_artifacts"
-            DEVICE_MODEL="iphone14pro"
-            DEVICE_VERSION="16.6"
+            DEVICE_MODEL="iphone13pro"
+            DEVICE_VERSION="15.7"
             XCRESULT_PATH="gs://$GOOGLE_CLOUD_BUCKET/$RESULTS_DIR/$DEVICE_MODEL-$DEVICE_VERSION-en-portrait/TestLogs/"
 
             curl -o /tmp/key-file.json $BITRISEIO_GOOGLE_APPLICATION_CREDENTIALS_URL 
@@ -1557,22 +1555,8 @@ workflows:
                 --results-bucket="$GOOGLE_CLOUD_BUCKET" \
                 --results-dir="$RESULTS_DIR")
 
-            echo "Your FIREBASE_TEST_RESULT:\n$FIREBASE_TEST_RESULT"
-
-            # the following code is temporary and only here to verify scope within bitrise
-            # it will be handled entirely in the next step and removed after testing
-            echo $XCRESULT_PATH
-            $HOME/google-cloud-sdk/bin/gsutil ls $XCRESULT_PATH
-            $HOME/google-cloud-sdk/bin/gsutil ls $XCRESULT_PATH | grep ".xcresult"
             FIREBASE_XCRESULT_PATH=$($HOME/google-cloud-sdk/bin/gsutil ls $XCRESULT_PATH | grep ".xcresult")
-            echo $FIREBASE_XCRESULT_PATH
             envman add --key FIREBASE_XCRESULT_PATH --value "$FIREBASE_XCRESULT_PATH"
-            mkdir firebase_xcresult
-            $HOME/google-cloud-sdk/bin/gsutil -m cp -r $FIREBASE_XCRESULT_PATH ./firebase_xcresult
-            ls -R ./firebase_xcresult
-            mv ./firebase_xcresult/*.xcresult ./firebase_xcresult/Test-Fennec_Enterprise.xcresult
-            ls ./firebase_xcresult
-            ls -R ./firebase_xcresult
     - script@1.1:
         is_always_run: true
         title: Create Perfherder Data Object from Firebase
@@ -1586,24 +1570,18 @@ workflows:
             # get dependency
             cd ./test-fixtures && git clone https://github.com/isabelrios/xcresult_extract.git
 
-            ls
-            echo $FIREBASE_XCRESULT_PATH
-            $HOME/google-cloud-sdk/bin/gsutil ls $FIREBASE_XCRESULT_PATH
-
+            # pull firebase xcresult and rename it to extract measurement data
             mkdir test_firebase_xcresult
             $HOME/google-cloud-sdk/bin/gsutil -m cp -r $FIREBASE_XCRESULT_PATH ./test_firebase_xcresult
-            ls -R ./test_firebase_xcresult
             mv ./test_firebase_xcresult/*.xcresult ./test_firebase_xcresult/Test-Fennec-test.xcresult
-            ls -R ./test_firebase_xcresult
-            echo "DerivedData/Client/Log/Tests"
-            ls /Users/vagrant/Library/Developer/Xcode/DerivedData
+
+            # firebase xcresult needs to be in the Test dir created during earlier build-for-testing step
             FIREBASE_XCRESULT="./test_firebase_xcresult/Test-Fennec-test.xcresult"
             CLIENT_PATH=$(ls /Users/vagrant/Library/Developer/Xcode/DerivedData | grep 'Client-')
             BITRISE_XCRESULT="/Users/vagrant/Library/Developer/Xcode/DerivedData/$CLIENT_PATH/Logs/Test/Test-Fennec-test.xcresult"
             mv $FIREBASE_XCRESULT $BITRISE_XCRESULT
 
-            ls /Users/vagrant/Library/Developer/Xcode/DerivedData/$CLIENT_PATH/Logs/Test
-
+            # create and print perf data object for perfherder ingest via taskcluster log output
             xcrun xcresulttool graph --path $BITRISE_XCRESULT
             ls ..
             python3 xcresult_extract/xcresult_extract.py -project ../Client.xcodeproj -scheme Fennec