Merge branch 'main' into tos-targeting

lmegviar · web-flow · commit 8b7ef07bc6e0 · 2025-05-14T12:50:43.000-04:00
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: 9449c578ded7318640af8be1bb8c094cd0c9fe64
-master: 25a38ac3b851b63e7d85a850940c354609e8126d
+beta: b9f5528970bc0b30e9a8b480508cae644ece194c
+master: bd4d1cd1ca3037e6dc8d4081a4303824880b1b45
 release: e6ff9138a45714e1a70159eae3bdc6d08817a3af
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml
@@ -1,5 +1,5 @@
-beta: 6cb8ee81d0f879fa4c1b44479d3a7267b4b59aca
-central: bff55607678cd5f5205475054563897a04ab91d2
-esr115: 2da0e1ca3736bd257cc0094db087de42184bc534
+beta: a13180567ad8c14f7c6d1f6151044e0af2853b85
+central: 39ecf83472f80f18340afaced9f7e67185127041
+esr115: f5ec212e9a385bc3020adfad6f32db563da4ce19
 esr128: a2b6434fdc6c7e4ce727d1d3957e346b6940f882
 release: e7b75daa0867081dd9ecc897f4f2280400d1214e
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml
@@ -1546,13 +1546,6 @@ pocketNewtab:
         pref: browser.newtabpage.activity-stream.newtabWallpapers.enabled
       description: >-
         Turns on and off wallpaper support.
-    wallpapersV2:
-      type: boolean
-      setPref:
-        branch: user
-        pref: browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled
-      description: >-
-        Turns on and off updated wallpaper experience.
     wallpapersHighlightEnabled:
       type: boolean
       setPref:
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/v140.0.0/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/v140.0.0/experimenter.yaml
@@ -1546,13 +1546,6 @@ pocketNewtab:
         pref: browser.newtabpage.activity-stream.newtabWallpapers.enabled
       description: >-
         Turns on and off wallpaper support.
-    wallpapersV2:
-      type: boolean
-      setPref:
-        branch: user
-        pref: browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled
-      description: >-
-        Turns on and off updated wallpaper experience.
     wallpapersHighlightEnabled:
       type: boolean
       setPref:
diff --git a/experimenter/experimenter/features/manifests/focus-ios/.ref-cache.yaml b/experimenter/experimenter/features/manifests/focus-ios/.ref-cache.yaml
@@ -17,7 +17,7 @@ focus/klar-v135.0: c3145564c445d2f7d9e95527e8242c5d21f99cf9
 focus/klar-v136.0: 2acf694b2444b4aa218a87157e1640a605cca4bd
 focus/klar-v137.0: 72386c1d3e182f6670926b3c1c3a09227fb7b120
 focus/klar-v138.0: 33f7f00718adf88505d1804ccedb56750b04f2fb
-main: a862a1bd3cdb19b4bb00a9ff1edc8b8f014e6e41
+main: ccb12fca9c54f5e3ccf0278138d876093a395efb
 release/v124: da250bed9e19c4978d4400d6d404cb312e33636e
 release/v125: a3e1e0773a00009e08d95726fd518ab642255ccd
 release/v126: 6f305409b4af68e8404401a2caad8cb0da9a0494
diff --git a/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml b/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml
@@ -1,4 +1,4 @@
-main: a862a1bd3cdb19b4bb00a9ff1edc8b8f014e6e41
+main: ccb12fca9c54f5e3ccf0278138d876093a395efb
 release/v117: 43b690c450066d4dde1b2ccb93ed3714d244d502
 release/v118: 89a7ea3c3372e5a4ef5b3c5b85499d26198d0524
 release/v119: 7dc381f991c6d2a983c3ba7f0cffd880e8c29e7b
diff --git a/experimenter/tests/firefox_desktop_beta_build.env b/experimenter/tests/firefox_desktop_beta_build.env
@@ -1 +1 @@
-FIREFOX_DESKTOP_BETA_TASK_ID="IKs7Ln-STIyfjZJt7UKDgg"
+FIREFOX_DESKTOP_BETA_TASK_ID="UYOQgu-8RsyItE16TnYJDw"
diff --git a/experimenter/tests/firefox_desktop_release_build.env b/experimenter/tests/firefox_desktop_release_build.env
@@ -1 +1 @@
-FIREFOX_DESKTOP_RELEASE_VERSION_ID="138.0.1"
+FIREFOX_DESKTOP_RELEASE_VERSION_ID="138.0.3"
diff --git a/experimenter/tests/firefox_fenix_beta_build.env b/experimenter/tests/firefox_fenix_beta_build.env
@@ -1 +1 @@
-FIREFOX_FENIX_BETA_TASK_ID="VOgkvviRR_umpZ2-plk9Kw"
+FIREFOX_FENIX_BETA_TASK_ID="MFE82Y4XRTulDjV8S6B9kw"
diff --git a/experimenter/tests/firefox_fennec_beta_build.env b/experimenter/tests/firefox_fennec_beta_build.env
@@ -1,3 +1,3 @@
 FIREFOX_FENNEC_BETA_VERSION_ID=
 BRANCH=
-# Firefox version is "138.0.1"
+# Firefox version is "138.0.3"
diff --git a/experimenter/tests/firefox_fennec_release_build.env b/experimenter/tests/firefox_fennec_release_build.env
@@ -1,3 +1,3 @@
-FIREFOX_FENNEC_RELEASE_VERSION_ID=" Firefox v138.1"
+FIREFOX_FENNEC_RELEASE_VERSION_ID=" Firefox v138.2"
 BRANCH="release/v138"
-# Firefox version is "138.0.1"
+# Firefox version is "138.0.3"
diff --git a/experimenter/tests/poetry.lock b/experimenter/tests/poetry.lock
diff --git a/experimenter/tests/pyproject.toml b/experimenter/tests/pyproject.toml
@@ -61,7 +61,7 @@ wrapt = "^1.17.0"
 pytest-rerunfailures = "^14.0"
 setuptools = "^70.3.0"
 dataclasses-json = "^0.6.7"
-flask = "^3.1.0"
+flask = "^3.1.1"
 pytest-repeat = "^0.9.4"
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-main: a862a1bd3cdb19b4bb00a9ff1edc8b8f014e6e41`
	`1`	`+main: ccb12fca9c54f5e3ccf0278138d876093a395efb`
`2`	`2`	`release/v117: 43b690c450066d4dde1b2ccb93ed3714d244d502`
`3`	`3`	`release/v118: 89a7ea3c3372e5a4ef5b3c5b85499d26198d0524`
`4`	`4`	`release/v119: 7dc381f991c6d2a983c3ba7f0cffd880e8c29e7b`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FIREFOX_DESKTOP_BETA_TASK_ID="IKs7Ln-STIyfjZJt7UKDgg"`
	`1`	`+FIREFOX_DESKTOP_BETA_TASK_ID="UYOQgu-8RsyItE16TnYJDw"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FIREFOX_DESKTOP_RELEASE_VERSION_ID="138.0.1"`
	`1`	`+FIREFOX_DESKTOP_RELEASE_VERSION_ID="138.0.3"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FIREFOX_FENIX_BETA_TASK_ID="VOgkvviRR_umpZ2-plk9Kw"`
	`1`	`+FIREFOX_FENIX_BETA_TASK_ID="MFE82Y4XRTulDjV8S6B9kw"`