Fix test plan variable.

mozilla · Dec 13, 2024 · edd855a · edd855a
1 parent bd23e91
commit edd855a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -368,8 +368,22 @@ jobs:
             poetry add pydantic==2.10.3
             poetry install
             poetry run pytest -k test_ios_integration.py --feature ios_enrollment
+      - run:
+          name: Collect XCTest Results
+          command: |
+            zip -r results.zip /Users/distiller/Library/Developer/Xcode/DerivedData/**/Logs/Test/*.xcresult
+          when: always
+      - run:
+          name: Collect xcodebuild log
+          command: |
+            cp /private/var/folders/ln/**/T/pytest-of-distiller/pytest-*/**/xcodebuild.log xcodebuild.log
+          when: always
       - store_artifacts:
           path: ~/project/firefox-ios/firefox-ios/firefox-ios-tests/Tests/ExperimentIntegrationTests/results/index.html
+      - store_artifacts:
+          path: ~/project/xcodebuild.log
+      - store_artifacts:
+          path: ~/project/results.zip
 
   integration_nimbus_sdk_targeting:
     machine:
@@ -797,6 +811,7 @@ workflows:
             branches:
               only:
                 - update_firefox_versions
+                - fix-11936
       - integration_nimbus_ios_enrollment:
           name: Test Firefox for iOS Release
           requires:
@@ -808,6 +823,7 @@ workflows:
             branches:
               only:
                 - update_firefox_versions
+                - fix-11936
       - integration_nimbus_sdk_targeting:
           name: Test SDK Targeting (Release Firefox)
           filters:

diff --git a/experimenter/tests/integration/nimbus/ios/xcodebuild.py b/experimenter/tests/integration/nimbus/ios/xcodebuild.py
@@ -18,7 +18,7 @@ def __init__(self, log, **kwargs):
             f"platform=iOS Simulator,name={self.device},OS={self.ios_version}"
         )
         self.scheme = "Fennec"
-        self.testPlan = "SyncIntegrationTestPlan"
+        self.testPlan = "ExperimentIntegrationTests"
         self.xcrun = XCRun()
         self.scheme = kwargs.get("scheme", self.scheme)
         self.test_plan = kwargs.get("test_plan", self.testPlan)

diff --git a/experimenter/tests/integration/nimbus/test_create_mobile_experiment.py b/experimenter/tests/integration/nimbus/test_create_mobile_experiment.py
@@ -36,7 +36,6 @@ def test_create_mobile_experiment_for_integration_test(
                     "value": "{}",
                 },
             ],
-        "userFacingName": experiment_slug,
         },
     }
     default_data_api.update(test_data)
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,6 @@ def test_create_mobile_experiment_for_integration_test( @@
                         "value": "{}",
                     },
                 ],
-            "userFacingName": experiment_slug,
             },
         }
         default_data_api.update(test_data)
@@ Expand Down @@