Merge branch 'main' into 10946-results-link

mozilla · Jan 15, 2025 · 67f8613 · 67f8613
2 parents 942f1ad + fbe5c40
commit 67f8613
Show file tree

Hide file tree

Showing 133 changed files with 52,073 additions and 148 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -304,7 +304,7 @@ jobs:
           name: Download test files and run
           command: |
             curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/mozilla/application-services/main/install-nimbus-cli.sh | bash
-            pip install poetry
+            pip install poetry==1.8.4
             make integration_test_nimbus_fenix PYTEST_ARGS="$PYTEST_ARGS"
       - android/save-gradle-cache:
           cache-prefix: v1a

diff --git a/application-services/application-services.env b/application-services/application-services.env
@@ -1 +1 @@
-APPLICATION_SERVICES_BUILD_ID=135.20241220191521
+APPLICATION_SERVICES_BUILD_ID=136.20250113194724
diff --git a/cirrus/server/poetry.lock b/cirrus/server/poetry.lock
diff --git a/cirrus/server/pyproject.toml b/cirrus/server/pyproject.toml
@@ -6,7 +6,7 @@ authors = [""]
 
 [tool.poetry.dependencies]
 python = "^3.10.10"
-ruff = "^0.8.0"
+ruff = "^0.9.1"
 fastapi = "^0.115.0"
 uvicorn = "^0.34.0"
 pytest = "^7.2.2"

diff --git a/experimenter/experimenter/experiments/constants.py b/experimenter/experimenter/experiments/constants.py
@@ -584,6 +584,7 @@ def parse(version_str):
         FIREFOX_133_B8 = "133.0b8"
         FIREFOX_133_0_1 = "133.0.1"
         FIREFOX_134 = "134.!"
+        FIREFOX_134_1_0 = "134.1.0"
         FIREFOX_135 = "135.!"
         FIREFOX_136 = "136.!"
         FIREFOX_137 = "137.!"

diff --git a/experimenter/experimenter/experiments/models.py b/experimenter/experimenter/experiments/models.py
@@ -876,30 +876,35 @@ def timeline(self):
                 "date": self.draft_date,
                 "is_active": self.is_draft,
                 "days": self.computed_draft_days,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Draft"],
             },
             {
                 "label": self.Status.PREVIEW,
                 "date": self.preview_date,
                 "is_active": self.is_preview,
                 "days": self.computed_preview_days,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Preview"],
             },
             {
                 "label": self.PublishStatus.REVIEW,
                 "date": self.review_date,
                 "is_active": self.is_review,
                 "days": self.computed_review_days,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Review"],
             },
             {
                 "label": NimbusConstants.ENROLLMENT,
                 "date": self.start_date,
                 "is_active": self.is_enrollment,
                 "days": self.computed_enrollment_days,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Enrollment"],
             },
             {
                 "label": self.Status.COMPLETE,
                 "date": self.computed_end_date,
                 "is_active": self.is_complete,
                 "days": self.computed_duration_days,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Complete"],
             },
         ]
         if not self.is_rollout:
@@ -910,6 +915,7 @@ def timeline(self):
                     "date": self._enrollment_end_date,
                     "is_active": self.is_observation,
                     "days": self.computed_observations_days,
+                    "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Observation"],
                 },
             )
 

diff --git a/experimenter/experimenter/experiments/tests/test_models.py b/experimenter/experimenter/experiments/tests/test_models.py
@@ -1777,36 +1777,42 @@ def test_timeline_dates_includes_correct_status_dates_and_flags(self):
                 "date": experiment.draft_date,
                 "is_active": False,
                 "days": 1,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Draft"],
             },
             {
                 "label": "Preview",
                 "date": experiment.preview_date,
                 "is_active": False,
                 "days": 0,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Preview"],
             },
             {
                 "label": "Review",
                 "date": experiment.review_date,
                 "is_active": False,
                 "days": 2,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Review"],
             },
             {
                 "label": NimbusConstants.ENROLLMENT,
                 "date": experiment.start_date,
                 "is_active": False,
                 "days": 2,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Enrollment"],
             },
             {
                 "label": NimbusConstants.OBSERVATION,
                 "date": experiment._enrollment_end_date,
                 "is_active": False,
                 "days": 2,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Observation"],
             },
             {
                 "label": "Complete",
                 "date": experiment.computed_end_date,
                 "is_active": True,
                 "days": 4,
+                "tooltip": NimbusUIConstants.TIMELINE_TOOLTIPS["Complete"],
             },
         ]
 
@@ -1815,6 +1821,7 @@ def test_timeline_dates_includes_correct_status_dates_and_flags(self):
             self.assertEqual(timeline[i]["date"], expected["date"])
             self.assertEqual(timeline[i]["is_active"], expected["is_active"])
             self.assertEqual(timeline[i].get("days"), expected["days"])
+            self.assertEqual(timeline[i].get("tooltip"), expected["tooltip"])
 
     def test_timeline_dates_complete_is_active_when_status_is_complete(self):
         experiment = NimbusExperimentFactory.create_with_lifecycle(

diff --git a/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml b/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml
@@ -1,3 +1,3 @@
-beta: f48d3ef3455e3f36156d8448f7f998c289483364
-master: f9517009d8a4946dbdd3acd72a31dc34fca79586
-release: 2af729f544f4d8b5371df3baceae96d37afeb286
+beta: 9565531878ceeaf734ed7711d6681fe8ead96374
+master: 86c208f86f35d53dc824f18f8e540fe5b0663870
+release: 8275040d808c4b15c7d8842a737505e9ed1b8fdc
diff --git a/experimenter/experimenter/features/manifests/fenix/beta.fml.yaml b/experimenter/experimenter/features/manifests/fenix/beta.fml.yaml
@@ -46,6 +46,17 @@ features:
           feature-setting-detect-only: 0
           feature-setting-global-rules: 1
           feature-setting-global-rules-sub-frames: 1
+  encourage-search-cfr:
+    description: A feature that shows a CFR on first launch to encourage users to make a search
+    variables:
+      cfrText:
+        description: The text to show in the CFR
+        type: Text
+        default: ""
+      enabled:
+        description: "When true, the CFR will show"
+        type: Boolean
+        default: false
   fingerprinting-protection:
     description: Control Fingerprinting Protection
     variables:
@@ -467,6 +478,13 @@ features:
         description: Open in app button
         type: Boolean
         default: true
+  pki:
+    description: Certificate verification configuration
+    variables:
+      certificateTransparencyMode:
+        description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
+        type: Int
+        default: 0
   print:
     description: A feature for printing from the share or browser menu.
     variables:

diff --git a/experimenter/experimenter/features/manifests/fenix/developer.fml.yaml b/experimenter/experimenter/features/manifests/fenix/developer.fml.yaml
@@ -46,6 +46,17 @@ features:
           feature-setting-detect-only: 0
           feature-setting-global-rules: 1
           feature-setting-global-rules-sub-frames: 1
+  encourage-search-cfr:
+    description: A feature that shows a CFR on first launch to encourage users to make a search
+    variables:
+      cfrText:
+        description: The text to show in the CFR
+        type: Text
+        default: ""
+      enabled:
+        description: "When true, the CFR will show"
+        type: Boolean
+        default: false
   fingerprinting-protection:
     description: Control Fingerprinting Protection
     variables:
@@ -493,6 +504,13 @@ features:
         description: Open in app button
         type: Boolean
         default: true
+  pki:
+    description: Certificate verification configuration
+    variables:
+      certificateTransparencyMode:
+        description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
+        type: Int
+        default: 0
   print:
     description: A feature for printing from the share or browser menu.
     variables:

diff --git a/experimenter/experimenter/features/manifests/fenix/experimenter.yaml b/experimenter/experimenter/features/manifests/fenix/experimenter.yaml
@@ -34,6 +34,17 @@ cookie-banners:
     sections-enabled:
       type: json
       description: This property provides a lookup table of whether or not the given section should be enabled.
+encourage-search-cfr:
+  description: A feature that shows a CFR on first launch to encourage users to make a search
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    cfrText:
+      type: string
+      description: The text to show in the CFR
+    enabled:
+      type: boolean
+      description: "When true, the CFR will show"
 fingerprinting-protection:
   description: Control Fingerprinting Protection
   hasExposure: true
@@ -263,6 +274,14 @@ pdfjs:
     open-in-app-button:
       type: boolean
       description: Open in app button
+pki:
+  description: Certificate verification configuration
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    certificateTransparencyMode:
+      type: int
+      description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
 print:
   description: A feature for printing from the share or browser menu.
   hasExposure: true

diff --git a/experimenter/experimenter/features/manifests/fenix/nightly.fml.yaml b/experimenter/experimenter/features/manifests/fenix/nightly.fml.yaml
@@ -46,6 +46,17 @@ features:
           feature-setting-detect-only: 0
           feature-setting-global-rules: 1
           feature-setting-global-rules-sub-frames: 1
+  encourage-search-cfr:
+    description: A feature that shows a CFR on first launch to encourage users to make a search
+    variables:
+      cfrText:
+        description: The text to show in the CFR
+        type: Text
+        default: ""
+      enabled:
+        description: "When true, the CFR will show"
+        type: Boolean
+        default: false
   fingerprinting-protection:
     description: Control Fingerprinting Protection
     variables:
@@ -467,6 +478,13 @@ features:
         description: Open in app button
         type: Boolean
         default: true
+  pki:
+    description: Certificate verification configuration
+    variables:
+      certificateTransparencyMode:
+        description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
+        type: Int
+        default: 0
   print:
     description: A feature for printing from the share or browser menu.
     variables:

diff --git a/experimenter/experimenter/features/manifests/fenix/release.fml.yaml b/experimenter/experimenter/features/manifests/fenix/release.fml.yaml
@@ -46,6 +46,17 @@ features:
           feature-setting-detect-only: 0
           feature-setting-global-rules: 1
           feature-setting-global-rules-sub-frames: 1
+  encourage-search-cfr:
+    description: A feature that shows a CFR on first launch to encourage users to make a search
+    variables:
+      cfrText:
+        description: The text to show in the CFR
+        type: Text
+        default: ""
+      enabled:
+        description: "When true, the CFR will show"
+        type: Boolean
+        default: false
   fingerprinting-protection:
     description: Control Fingerprinting Protection
     variables:
@@ -467,6 +478,13 @@ features:
         description: Open in app button
         type: Boolean
         default: true
+  pki:
+    description: Certificate verification configuration
+    variables:
+      certificateTransparencyMode:
+        description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
+        type: Int
+        default: 0
   print:
     description: A feature for printing from the share or browser menu.
     variables:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		APPLICATION_SERVICES_BUILD_ID=135.20241220191521
		APPLICATION_SERVICES_BUILD_ID=136.20250113194724