Update evergreen build configs for 25.lts (#3033)

Add sbversion 16, remove sbversion 13. b/293645066
youtube · Apr 24, 2024 · 24f5fbb · 24f5fbb
1 parent ca8456e
commit 24f5fbb
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 71 deletions.
diff --git a/.github/config/evergreen-arm-hardfp.json b/.github/config/evergreen-arm-hardfp.json
@@ -13,9 +13,9 @@
   },
   "platforms": [
     "evergreen-arm-hardfp",
-    "evergreen-arm-hardfp-sbversion-15",
     "evergreen-arm-hardfp-sbversion-14",
-    "evergreen-arm-hardfp-sbversion-13"
+    "evergreen-arm-hardfp-sbversion-15",
+    "evergreen-arm-hardfp-sbversion-16"
   ],
   "includes": [
     {
@@ -28,33 +28,33 @@
       "dimension": "release_version=regex:10.*"
     },
     {
-      "name":"sbversion-15",
-      "platform":"evergreen-arm-hardfp-sbversion-15",
+      "name":"sbversion-14",
+      "platform":"evergreen-arm-hardfp-sbversion-14",
       "target_platform":"evergreen-arm-hardfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
       "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
-      "sb_api_version": "15",
+      "sb_api_version": "14",
       "dimension": "release_version=regex:10.*"
     },
     {
-      "name":"sbversion-14",
-      "platform":"evergreen-arm-hardfp-sbversion-14",
+      "name":"sbversion-15",
+      "platform":"evergreen-arm-hardfp-sbversion-15",
       "target_platform":"evergreen-arm-hardfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
       "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
-      "sb_api_version": "14",
+      "sb_api_version": "15",
       "dimension": "release_version=regex:10.*"
     },
     {
-      "name":"sbversion-13",
-      "platform":"evergreen-arm-hardfp-sbversion-13",
+      "name":"sbversion-16",
+      "platform":"evergreen-arm-hardfp-sbversion-16",
       "target_platform":"evergreen-arm-hardfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
       "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
-      "sb_api_version": "13",
+      "sb_api_version": "16",
       "dimension": "release_version=regex:10.*"
     }
   ]

diff --git a/.github/config/evergreen-arm-softfp-no-loader.json b/.github/config/evergreen-arm-softfp-no-loader.json
diff --git a/.github/config/evergreen-arm-softfp.json b/.github/config/evergreen-arm-softfp.json
@@ -13,8 +13,9 @@
   },
   "platforms": [
     "evergreen-arm-softfp",
+    "evergreen-arm-softfp-sbversion-14",
     "evergreen-arm-softfp-sbversion-15",
-		"evergreen-arm-softfp-sbversion-14"
+    "evergreen-arm-softfp-sbversion-16"
   ],
   "includes": [
     {
@@ -25,6 +26,15 @@
       "extra_gn_arguments":"use_asan=false",
       "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     },
+    {
+      "name":"sbversion-14",
+      "platform":"evergreen-arm-softfp-sbversion-14",
+      "target_platform":"evergreen-arm-softfp",
+      "target_cpu":"target_cpu=\\\"arm\\\"",
+      "extra_gn_arguments":"use_asan=false",
+      "sb_api_version":"14",
+      "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
+    },
     {
       "name":"sbversion-15",
       "platform":"evergreen-arm-softfp-sbversion-15",
@@ -35,12 +45,12 @@
       "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     },
     {
-      "name":"sbversion-14",
-      "platform":"evergreen-arm-softfp-sbversion-14",
+      "name":"sbversion-16",
+      "platform":"evergreen-arm-softfp-sbversion-16",
       "target_platform":"evergreen-arm-softfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"14",
+      "sb_api_version":"16",
       "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     }
   ]

diff --git a/.github/config/evergreen-arm64.json b/.github/config/evergreen-arm64.json
@@ -2,9 +2,9 @@
   "docker_service": "build-evergreen",
   "platforms": [
     "evergreen-arm64",
-    "evergreen-arm64-sbversion-15",
     "evergreen-arm64-sbversion-14",
-    "evergreen-arm64-sbversion-13"
+    "evergreen-arm64-sbversion-15",
+    "evergreen-arm64-sbversion-16"
   ],
   "includes": [
     {
@@ -15,28 +15,28 @@
       "extra_gn_arguments":"use_asan=false"
     },
     {
-      "name":"sbversion-15",
-      "platform":"evergreen-arm64-sbversion-15",
+      "name":"sbversion-14",
+      "platform":"evergreen-arm64-sbversion-14",
       "target_platform":"evergreen-arm64",
       "target_cpu":"target_cpu=\\\"arm64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"15"
+      "sb_api_version":"14"
     },
     {
-      "name":"sbversion-14",
-      "platform":"evergreen-arm64-sbversion-14",
+      "name":"sbversion-15",
+      "platform":"evergreen-arm64-sbversion-15",
       "target_platform":"evergreen-arm64",
       "target_cpu":"target_cpu=\\\"arm64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"14"
+      "sb_api_version":"15"
     },
     {
-      "name":"sbversion-13",
-      "platform":"evergreen-arm64-sbversion-13",
+      "name":"sbversion-16",
+      "platform":"evergreen-arm64-sbversion-16",
       "target_platform":"evergreen-arm64",
       "target_cpu":"target_cpu=\\\"arm64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"13"
+      "sb_api_version":"16"
     }
   ]
 }
diff --git a/.github/config/evergreen-x64.json b/.github/config/evergreen-x64.json
@@ -5,9 +5,9 @@
   "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"],
   "platforms": [
     "evergreen-x64",
+    "evergreen-x64-sbversion-14",
     "evergreen-x64-sbversion-15",
-		"evergreen-x64-sbversion-14",
-    "evergreen-x64-sbversion-13"
+    "evergreen-x64-sbversion-16"
   ],
   "includes": [
     {
@@ -18,28 +18,28 @@
       "extra_gn_arguments":"use_asan=false"
     },
     {
-      "name":"sbversion-15",
-      "platform":"evergreen-x64-sbversion-15",
+      "name":"sbversion-14",
+      "platform":"evergreen-x64-sbversion-14",
       "target_platform":"evergreen-x64",
       "target_cpu":"target_cpu=\\\"x64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"15"
+      "sb_api_version":"14"
     },
     {
-      "name":"sbversion-14",
-      "platform":"evergreen-x64-sbversion-14",
+      "name":"sbversion-15",
+      "platform":"evergreen-x64-sbversion-15",
       "target_platform":"evergreen-x64",
       "target_cpu":"target_cpu=\\\"x64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"14"
+      "sb_api_version":"15"
     },
     {
-      "name":"sbversion-13",
-      "platform":"evergreen-x64-sbversion-13",
+      "name":"sbversion-16",
+      "platform":"evergreen-x64-sbversion-16",
       "target_platform":"evergreen-x64",
       "target_cpu":"target_cpu=\\\"x64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"13"
+      "sb_api_version":"16"
     }
   ]
 }
diff --git a/.github/config/linux.json b/.github/config/linux.json
@@ -7,9 +7,9 @@
     "linux-x64x11",
     "linux-x64x11-egl",
     "linux-x64x11-skia",
-    "linux-x64x11-sbversion-13",
     "linux-x64x11-sbversion-14",
-    "linux-x64x11-sbversion-15"
+    "linux-x64x11-sbversion-15",
+    "linux-x64x11-sbversion-16"
   ],
   "includes": [
     {
@@ -27,12 +27,6 @@
       "platform":"linux-x64x11-skia",
       "target_platform":"linux-x64x11-skia"
     },
-    {
-      "name":"sbversion-13",
-      "platform":"linux-x64x11-sbversion-13",
-      "target_platform":"linux-x64x11",
-      "sb_api_version":"13"
-    },
     {
       "name":"sbversion-14",
       "platform":"linux-x64x11-sbversion-14",
@@ -44,6 +38,12 @@
       "platform":"linux-x64x11-sbversion-15",
       "target_platform":"linux-x64x11",
       "sb_api_version":"15"
+    },
+    {
+      "name":"sbversion-16",
+      "platform":"linux-x64x11-sbversion-16",
+      "target_platform":"linux-x64x11",
+      "sb_api_version":"16"
     }
   ]
 }
diff --git a/.github/config/raspi-2.json b/.github/config/raspi-2.json
@@ -13,7 +13,8 @@
   },
   "platforms": [
     "raspi-2",
-    "raspi-2-sbversion-15"
+    "raspi-2-sbversion-15",
+    "raspi-2-sbversion-16"
   ],
   "includes": [
     {
@@ -32,6 +33,15 @@
       "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
       "sb_api_version": "15",
       "dimension": "release_version=regex:10.*"
+    },
+    {
+      "name":"sbversion-16",
+      "platform":"raspi-2-sbversion-16",
+      "target_platform":"raspi-2",
+      "target_cpu":"target_cpu=\\\"arm\\\"",
+      "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
+      "sb_api_version": "16",
+      "dimension": "release_version=regex:10.*"
     }
   ]
 }
diff --git a/.github/workflows/evergreen.yaml b/.github/workflows/evergreen.yaml
@@ -49,15 +49,6 @@ jobs:
       platform: evergreen-arm-softfp
       nightly: ${{ github.event.inputs.nightly }}
       run_api_leak_detector: true
-  evergreen-arm-softfp-no-loader:
-    uses: ./.github/workflows/main.yaml
-    permissions:
-      packages: write
-      pull-requests: write
-    with:
-      platform: evergreen-arm-softfp-no-loader
-      nightly: ${{ github.event.inputs.nightly }}
-      run_api_leak_detector: true
   evergreen-arm64:
     uses: ./.github/workflows/main.yaml
     permissions: