diff --git a/.github/config/evergreen-arm-hardfp.json b/.github/config/evergreen-arm-hardfp.json index 113fd11ab46..1be38f06260 100644 --- a/.github/config/evergreen-arm-hardfp.json +++ b/.github/config/evergreen-arm-hardfp.json @@ -13,8 +13,6 @@ }, "platforms": [ "evergreen-arm-hardfp", - "evergreen-arm-hardfp-sbversion-15", - "evergreen-arm-hardfp-sbversion-16", "evergreen-arm-hardfp-sbversion-17" ], "includes": [ @@ -27,24 +25,6 @@ "evergreen_loader_extra_gn_arguments": "use_asan=false is_clang=false", "dimension": "release_version=regex:10.*" }, - { - "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": "15" - }, - { - "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": "16" - }, { "name":"sbversion-17", "platform":"evergreen-arm-hardfp-sbversion-17", diff --git a/.github/config/evergreen-arm-softfp.json b/.github/config/evergreen-arm-softfp.json index 0594f2d36bf..104809b1983 100644 --- a/.github/config/evergreen-arm-softfp.json +++ b/.github/config/evergreen-arm-softfp.json @@ -13,8 +13,6 @@ }, "platforms": [ "evergreen-arm-softfp", - "evergreen-arm-softfp-sbversion-15", - "evergreen-arm-softfp-sbversion-16", "evergreen-arm-softfp-sbversion-17" ], "includes": [ @@ -26,24 +24,6 @@ "extra_gn_arguments":"use_asan=false", "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" }, - { - "name":"sbversion-15", - "platform":"evergreen-arm-softfp-sbversion-15", - "target_platform":"evergreen-arm-softfp", - "target_cpu":"target_cpu=\\\"arm\\\"", - "extra_gn_arguments":"use_asan=false", - "sb_api_version":"15", - "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" - }, - { - "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":"16", - "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" - }, { "name":"sbversion-17", "platform":"evergreen-arm-softfp-sbversion-17", diff --git a/.github/config/evergreen-arm64.json b/.github/config/evergreen-arm64.json index 981f77a45a6..e11fb6f4105 100644 --- a/.github/config/evergreen-arm64.json +++ b/.github/config/evergreen-arm64.json @@ -3,8 +3,6 @@ "evergreen_loader": "android-arm64", "platforms": [ "evergreen-arm64", - "evergreen-arm64-sbversion-15", - "evergreen-arm64-sbversion-16", "evergreen-arm64-sbversion-17" ], "includes": [ @@ -16,24 +14,6 @@ "extra_gn_arguments":"use_asan=false", "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" }, - { - "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":"15", - "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" - }, - { - "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":"16", - "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" - }, { "name":"sbversion-17", "platform":"evergreen-arm64-sbversion-17", diff --git a/.github/config/evergreen-x64.json b/.github/config/evergreen-x64.json index 21bc0e71397..e8b3bb2bc39 100644 --- a/.github/config/evergreen-x64.json +++ b/.github/config/evergreen-x64.json @@ -5,8 +5,6 @@ "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt", "evergreen"], "platforms": [ "evergreen-x64", - "evergreen-x64-sbversion-15", - "evergreen-x64-sbversion-16", "evergreen-x64-sbversion-17" ], "includes": [ @@ -17,22 +15,6 @@ "target_cpu":"target_cpu=\\\"x64\\\"", "extra_gn_arguments":"use_asan=false" }, - { - "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":"15" - }, - { - "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":"16" - }, { "name":"sbversion-17", "platform":"evergreen-x64-sbversion-17", diff --git a/.github/config/linux.json b/.github/config/linux.json index 4f591b03479..3c2b325eaa4 100644 --- a/.github/config/linux.json +++ b/.github/config/linux.json @@ -7,8 +7,6 @@ "linux-x64x11", "linux-x64x11-egl", "linux-x64x11-skia", - "linux-x64x11-sbversion-15", - "linux-x64x11-sbversion-16", "linux-x64x11-sbversion-17" ], "includes": [ @@ -27,18 +25,6 @@ "platform":"linux-x64x11-skia", "target_platform":"linux-x64x11-skia" }, - { - "name":"sbversion-15", - "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" - }, { "name":"sbversion-17", "platform":"linux-x64x11-sbversion-17", diff --git a/.github/config/raspi-2.json b/.github/config/raspi-2.json index 1df9213251b..f5b89732987 100644 --- a/.github/config/raspi-2.json +++ b/.github/config/raspi-2.json @@ -13,8 +13,6 @@ }, "platforms": [ "raspi-2", - "raspi-2-sbversion-15", - "raspi-2-sbversion-16", "raspi-2-sbversion-17" ], "includes": [ @@ -25,22 +23,6 @@ "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false" }, - { - "name":"sbversion-15", - "platform":"raspi-2-sbversion-15", - "target_platform":"raspi-2", - "target_cpu":"target_cpu=\\\"arm\\\"", - "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false", - "sb_api_version": "15" - }, - { - "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" - }, { "name":"sbversion-17", "platform":"raspi-2-sbversion-17",