fix: resolve three Integration Tests and Scheduled Chores CI failures

- Move capture_orgid_using_task fixture from test_integration_infrastructure.py
  to conftest.py so pytest 8.x discovers it when --org is passed (previously
  the fixture was silently skipped during collection, causing "fixture not found"
  errors on test_cli_specified_org, test_org_shape, and test_org_shape_reuse)

- Replace `uv run cci robot install_playwright` in robot_ui job with explicit
  `uv pip install robotframework-browser && uv run python -m Browser.entry init`
  because uv-managed envs do not install pip by default, causing the pip-based
  install inside the cci command to fail

- Fix update_api_versions Scheduled Chores job: use `git switch -C` (reset if
  branch exists) and `git push --force-with-lease` to handle the case where a
  prior run already created the update branch; also check for an existing PR
  before creating a new one to avoid duplicate-PR errors

Author: jstvz

.github/workflows/chores.yml

@@ -48,14 +48,20 @@ jobs:
               run: |
                   git config user.name github-actions[bot]
                   git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-                  git switch -c "update-sfdc-api-v$VERSION"
+                  git switch -C "update-sfdc-api-v$VERSION"
                   git add cumulusci/cumulusci.yml
                   git commit -m "Automated update to sfdc API version $VERSION"
-                  git push origin "update-sfdc-api-v$VERSION"
-            - env:
+                  git push --force-with-lease origin "update-sfdc-api-v$VERSION"
+            - name: Create or update PR
+              env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
-                  gh pr create --fill --label 'auto-pr'
+                  existing_pr=$(gh pr list --head "update-sfdc-api-v$VERSION" --json number -q '.[0].number')
+                  if [ -n "$existing_pr" ]; then
+                      echo "PR #$existing_pr already exists for update-sfdc-api-v$VERSION"
+                  else
+                      gh pr create --fill --label 'auto-pr'
+                  fi
     test_sfdx_release_candidate:
         uses: ./.github/workflows/release_test_sfdx.yml
         with:

.github/workflows/slow_integration_tests.yml

@@ -91,7 +91,9 @@ jobs:
                   wget -qO- https://developer.salesforce.com/media/salesforce-cli/sf/channels/stable/sf-linux-x64.tar.xz | tar xJ -C sfdx --strip-components 1
                   echo $(realpath sfdx/bin) >> $GITHUB_PATH
             - name: Initialize Browser/Playwright
-              run: uv run cci robot install_playwright
+              run: |
+                  uv pip install robotframework-browser
+                  uv run python -m Browser.entry init
             - name: Authenticate Dev Hub
               run: |
                   sf plugins --core

cumulusci/conftest.py

@@ -179,3 +179,31 @@ def task_context(org_config, project_config):
     return TaskContext(
         org_config=org_config, project_config=project_config, logger=getLogger()
     )
+
+
+@pytest.fixture()
+def capture_orgid_using_task(create_task, tmp_path):
+    """Returns a callable that captures the org ID by running a SOQL query task.
+
+    Moved from test_integration_infrastructure.py to ensure pytest 8.x
+    discovers this fixture when tests run with --org.
+    """
+
+    def _capture_orgid_using_task():
+        from cumulusci.tasks.salesforce import SOQLQuery
+
+        csv_output = Path(tmp_path) / "foo.csv"
+        t = create_task(
+            SOQLQuery,
+            {
+                "query": "select Id from Organization",
+                "object": "Organization",
+                "result_file": csv_output,
+            },
+        )
+        t()
+        assert csv_output.exists()
+        org_id = csv_output.read_text().split("\n")[1].split(",")[0]
+        return org_id.strip('"')
+
+    return _capture_orgid_using_task

cumulusci/tests/test_integration_infrastructure.py

@@ -13,26 +13,6 @@
 )
 
 
-@pytest.fixture()
-def capture_orgid_using_task(create_task: callable, tmp_path: str) -> str:
-    def _capture_orgid_using_task():
-        csv_output = Path(tmp_path) / "foo.csv"
-        t = create_task(
-            SOQLQuery,
-            {
-                "query": "select Id from Organization",
-                "object": "Organization",
-                "result_file": csv_output,
-            },
-        )
-        t()
-        assert csv_output.exists()
-        org_id = csv_output.read_text().split("\n")[1].split(",")[0]
-        return org_id.strip('"')
-
-    return _capture_orgid_using_task
-
-
 class TestIntegrationInfrastructure:
     "Test our two plugins for doing integration testing"