Merge branch 'main' into tos-targeting

Author: lmegviar

.circleci/config.yml

@@ -403,9 +403,10 @@ jobs:
       - run:
           name: Run Tests
           command: |
-            curl -sSL https://install.python-poetry.org | python3 - --version 1.8.4
+            curl -sSL https://install.python-poetry.org | python3 - --version 2.1.1
             echo 'export PATH=/Users/distiller/.local/bin:$PATH' >> "$BASH_ENV"
             source $BASH_ENV
+            EPOCH=$(date +"%s")
             cd firefox-ios/firefox-ios/firefox-ios-tests/Tests/ExperimentIntegrationTests
             git cherry-pick dfd0b8a556f5990d0b5d9351df8acf571895e6dc -X theirs || true
             export SIMULATOR_UDID=$(python get_specific_device_udid.py)
@@ -414,7 +415,7 @@ jobs:
             poetry add pydantic==2.10.3
             poetry install
             poetry run pytest --junitxml=/Users/distiller/project/workspace/test-results/experimenter_ios_integration_tests.xml -k test_ios_integration.py --feature ios_enrollment
-            cp experimenter_ios_integration_tests.xml dashboard/test-results/$(CIRCLE_BUILD_NUM)__$(EPOCH_TIME)__$(CIRCLE_PROJECT_REPONAME)__$(CIRCLE_WORKFLOW_ID)__)ios__integration__results.xml
+            cp /Users/distiller/project/workspace/test-results/experimenter_ios_integration_tests.xml /Users/distiller/project/dashboard/test-results/${CIRCLE_BUILD_NUM}__$(date +"%s")__${CIRCLE_PROJECT_REPONAME}__${CIRCLE_WORKFLOW_ID}__ios__integration__results.xml
       - run:
           name: Collect XCTest Results
           command: |

Makefile

@@ -163,10 +163,10 @@ kill: compose_stop compose_rm docker_prune  ## Stop, remove, and prune container
 	echo "All containers removed!"
 
 lint: build_test  ## Running linting on source code
+	-docker rm experimenter_test;
 	$(COMPOSE_TEST_RUN) experimenter sh -c '$(WAIT_FOR_DB) (${PARALLEL} "$(NIMBUS_SCHEMA_CHECK)" "$(PYTHON_CHECK_MIGRATIONS)" "$(CHECK_DOCS)" "$(RUFF_FORMAT_CHECK)" "$(RUFF_CHECK)" "$(DJLINT_CHECK)" "$(ESLINT_LEGACY)" "$(ESLINT_NIMBUS_UI)" "$(ESLINT_NIMBUS_UI_NEW)" "$(TYPECHECK_NIMBUS_UI)" "$(PYTHON_TYPECHECK)" "$(PYTHON_TEST)" "$(JS_TEST_LEGACY)" "$(JS_TEST_NIMBUS_UI)" "$(JS_TEST_REPORTING)") ${COLOR_CHECK}'
 
 check: lint
-	docker rm experimenter_test
 
 check_and_report: lint
 	docker cp experimenter_test:/experimenter/experimenter_coverage.json workspace/test-results
@@ -177,7 +177,6 @@ check_and_report: lint
 	cp workspace/test-results/experimenter_tests.xml $(UNIT_JUNIT_XML)
 	cp workspace/test-results/coverage_report/coverage-final.json $(UI_COVERAGE_JSON)
 	cp workspace/test-results/junit.xml $(UI_JUNIT_XML)
-	docker rm experimenter_test
 
 test: build_test  ## Run tests
 	$(COMPOSE_TEST_RUN) experimenter sh -c '$(WAIT_FOR_DB) $(PYTHON_TEST)'
@@ -239,17 +238,20 @@ dependabot_approve:
 integration_shell:
 	$(COMPOSE_INTEGRATION_RUN) firefox bash
 
+integration_clean:
+	-docker rm experimenter_integration
+
 integration_sdk_shell: build_prod build_integration_test
 	$(COMPOSE_INTEGRATION_RUN) rust-sdk bash
 
 integration_vnc_shell: build_prod
 	$(COMPOSE_INTEGRATION) up -d firefox 
 	docker exec -it $$(docker ps -qf "name=experimenter-firefox-1") bash
 
-integration_test_legacy: build_prod
+integration_test_legacy: build_prod integration_clean
 	MOZ_HEADLESS=1 $(COMPOSE_INTEGRATION_RUN) firefox sh -c "./experimenter/tests/experimenter_legacy_tests.sh"
 
-integration_test_nimbus_desktop: build_prod
+integration_test_nimbus_desktop: build_prod integration_clean
 	MOZ_HEADLESS=1 $(COMPOSE_INTEGRATION_RUN) firefox sh -c "FIREFOX_CHANNEL=$(FIREFOX_CHANNEL) PYTEST_SENTRY_DSN=$(PYTEST_SENTRY_DSN) PYTEST_SENTRY_ALWAYS_REPORT=$(PYTEST_SENTRY_ALWAYS_REPORT) CIRCLECI=$(CIRCLECI) ./experimenter/tests/nimbus_integration_tests.sh"
 
 integration_test_nimbus_sdk: build_integration_test build_prod
@@ -258,12 +260,11 @@ integration_test_nimbus_sdk: build_integration_test build_prod
 integration_test_nimbus_fenix:
 	poetry -C experimenter/tests/integration/ -vvv install --no-root
 	poetry -C experimenter/tests/integration/ -vvv run pytest --html=workspace/test-results/report.htm --self-contained-html --reruns-delay 30 --driver Firefox experimenter/tests/integration/nimbus/android --junitxml=workspace/test-results/experimenter_fenix_integration_tests.xml -vvv
-	cp experimenter_fenix_integration_tests.xml $(TEST_RESULTS_DIR)/$(TEST_FILE_PREFIX)fenix__integration__results.xml
+	cp workspace/test-results/experimenter_fenix_integration_tests.xml $(TEST_RESULTS_DIR)/$(TEST_FILE_PREFIX)fenix__integration__results.xml
 
 make integration_test_and_report:
 	docker cp experimenter_integration:/code/experimenter/tests/integration/test-reports/experimenter_integration_tests.xml workspace/test-results
 	cp workspace/test-results/experimenter_integration_tests.xml $(INTEGRATION_JUNIT_XML)
-	docker rm experimenter_integration
 
 # cirrus
 CIRRUS_ENABLE = export CIRRUS=1 &&
@@ -299,15 +300,14 @@ cirrus_test: cirrus_build_test
 cirrus_check: cirrus_lint
 	docker rm experimenter_test
 
-cirrus_lint: cirrus_build_test
+cirrus_lint: cirrus_build_test integration_clean
 	$(CIRRUS_ENABLE) $(COMPOSE_TEST_RUN) cirrus sh -c "$(CIRRUS_RUFF_CHECK) && $(CIRRUS_BLACK_CHECK) && $(CIRRUS_PYTHON_TYPECHECK) && $(CIRRUS_PYTEST) && $(CIRRUS_GENERATE_DOCS) --check"
 
 cirrus_check_and_report: cirrus_lint
 	docker cp experimenter_test:/cirrus/cirrus_pytest.xml workspace/test-results
 	docker cp experimenter_test:/cirrus/cirrus_coverage.json workspace/test-results
 	cp workspace/test-results/cirrus_pytest.xml $(CIRRUS_JUNIT_XML)
 	cp workspace/test-results/cirrus_coverage.json $(CIRRUS_COVERAGE_JSON)
-	docker rm experimenter_test
 
 cirrus_code_format: cirrus_build
 	$(CIRRUS_ENABLE) $(COMPOSE_RUN) cirrus sh -c '$(CIRRUS_RUFF_FIX) && $(CIRRUS_BLACK_FIX)'

application-services/application-services.env

@@ -1 +1 @@
-APPLICATION_SERVICES_BUILD_ID=140.20250502050320
+APPLICATION_SERVICES_BUILD_ID=140.20250523140405

cirrus/server/poetry.lock

@@ -21,7 +21,7 @@ python-decouple = "^3.8"
 glean-sdk = "^53.2.0"
 pytest-mock = "^3.14.0"
 mozilla-nimbus-shared = "^2.5.2"
-sentry-sdk = "^2.27.0"
+sentry-sdk = "^2.29.1"
 
 [tool.pyright]
 typeCheckingMode = "strict"

cirrus/server/pyproject.toml

@@ -601,6 +601,7 @@ def parse(version_str):
         FIREFOX_138_B3 = "138.0b3"
         FIREFOX_138_1_0 = "138.1.0"
         FIREFOX_138_2_0 = "138.2.0"
+        FIREFOX_138_0_3 = "138.0.3"
         FIREFOX_139 = "139.!"
         FIREFOX_140 = "140.!"
 

experimenter/experimenter/experiments/constants.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.2.1 on 2025-05-13 15:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("experiments", "0282_nimbusversionedschema_has_remote_schema"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="nimbusexperiment",
+            name="excluded_experiments",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="excluded_by",
+                through="experiments.NimbusExperimentBranchThroughExcluded",
+                through_fields=("parent_experiment", "child_experiment"),
+                to="experiments.nimbusexperiment",
+                verbose_name="Excluded Experiments",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="nimbusexperiment",
+            name="required_experiments",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="required_by",
+                through="experiments.NimbusExperimentBranchThroughRequired",
+                through_fields=("parent_experiment", "child_experiment"),
+                to="experiments.nimbusexperiment",
+                verbose_name="Required Experiments",
+            ),
+        ),
+    ]

experimenter/experimenter/experiments/migrations/0283_alter_nimbusexperiment_excluded_experiments_and_more.py

@@ -1,3 +1,3 @@
-beta: da58b5e4f6ef5832bc8d5eca08b00ca01a410e70
-master: 476b430f3e7a0941f1c002f4774de61c78a80a03
-release: 0047599b6a6a2af6ac0361c4e47e2b2998295cb9
+beta: 7cb196f9239afbe50f50d188e7d459282213a18f
+master: 6a72a6d20eeb1b20b93862a79166938d6ce794a0
+release: 0889458d6f50fc3cacb7c67ea881ffe24ca6710d

experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml

@@ -5,17 +5,6 @@ about:
 channels:
   - beta
 features:
-  SetupChecklist:
-    description: A feature on the home page that allows the user to track onboarding setup progress.
-    variables:
-      enabled:
-        description: "If true, the setup checklist will be enabled."
-        type: Boolean
-        default: false
-      setup-checklist-type:
-        description: The collection used for the setup checklist.
-        type: SetupChecklistType
-        default: collection-1
   alternative-app-launcher-icon:
     description: A feature that changes the app launcher icon background color.
     variables:
@@ -71,6 +60,17 @@ features:
           feature-setting-detect-only: 0
           feature-setting-global-rules: 1
           feature-setting-global-rules-sub-frames: 1
+  doh:
+    description: Feature controlling DNS over HTTPS (DoH).
+    variables:
+      autoselect-enabled:
+        description: "Controls the network.android_doh.autoselect_enabled pref and automatically chooses a DoH provider when Default Protection mode is selected.\n"
+        type: Boolean
+        default: false
+      show-ui:
+        description: "When `true`, include DoH settings in the settings UI.\n"
+        type: Boolean
+        default: false
   encourage-search-cfr:
     description: A feature that shows a CFR on first launch to encourage users to make a search
     variables:
@@ -154,6 +154,13 @@ features:
         description: "If true, the feature is active"
         type: Boolean
         default: false
+  homepage-as-new-tab:
+    description: Enables homepage as a a new tab.
+    variables:
+      enabled:
+        description: "Whether or not to enable homepage as a new tab\n"
+        type: Boolean
+        default: false
   homepage-hide-frecent-top-sites:
     description: Hides frecent top sites on the homepage.
     variables:
@@ -214,7 +221,7 @@ features:
             ordering: 1
             prerequisites:
               - ALWAYS
-            primary-button-label: onboarding_term_of_service_agree_and_continue_button_label
+            primary-button-label: onboarding_term_of_service_agree_and_continue_button_label_2
             secondary-button-label: ""
             title: onboarding_welcome_to_firefox
           default-browser:
@@ -628,8 +635,8 @@ features:
     variables:
       postQuantumKeyExchangeEnabled:
         description: "Toggles the security.tls.enable_kyber and network.http.http3.enable_kyber preferences.\n"
-        type: Boolean
-        default: false
+        type: Option<Boolean>
+        default: ~
   print:
     description: A feature for printing from the share or browser menu.
     variables:
@@ -695,6 +702,17 @@ features:
         description: "Whether the feature to close synced tabs is enabled. When enabled, this device will allow other devices to close tabs that are open on this device, and show a \"close\" button for tabs that are currently open on other supported devices in the synced tabs tray.\n"
         type: Boolean
         default: true
+  same-document-navigation-overrides-load-type:
+    description: Control whether the same document navigation overrides the load type.
+    variables:
+      enabled:
+        description: "Overrides the loadType when it is a same document navigation\n"
+        type: Boolean
+        default: true
+      force-disable-uri:
+        description: "Disable overriding the loadType during same document navigation on the domain specified by this URI.\n"
+        type: String
+        default: ""
   search-extra-params:
     description: A feature that provides additional args for search.
     variables:
@@ -747,13 +765,24 @@ features:
         description: "A template for the shared message, supporting three placeholders. A shared link, the brand name and a store download link."
         type: Text
         default: ""
+  setup-checklist:
+    description: A feature on the home page that allows the user to track onboarding setup progress.
+    variables:
+      enabled:
+        description: "If true, the setup checklist will be enabled."
+        type: Boolean
+        default: false
+      setup-checklist-type:
+        description: The collection used for the setup checklist.
+        type: SetupChecklistType
+        default: collection-1
   ship:
     description: The feature that controls Session History in Parent (SHIP) in Gecko.
     variables:
       disabled:
         description: "Whether or not to disable SHIP. SHIP is enabled when set to false. SHIP is disabled when set to true.\n"
         type: Boolean
-        default: true
+        default: false
   splash-screen:
     description: "A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run."
     variables:
@@ -775,7 +804,7 @@ features:
       enabled:
         description: "Suggest domains from the shipped domain list.\n"
         type: Boolean
-        default: true
+        default: false
   tab-strip:
     description: Enables tab strip.
     variables: