Revert "[CI] Expand spot instance trial a bit (#126928)"

This reverts commit 79935f3.

.buildkite/pipelines/hourly.yml

@@ -19,7 +19,7 @@ steps:
     label: 'Default CI Group'
     parallelism: 27
     agents:
-      queue: n2-4-spot
+      queue: n2-4
     depends_on: build
     timeout_in_minutes: 250
     key: default-cigroup
@@ -31,7 +31,7 @@ steps:
   - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Docker CI Group'
     agents:
-      queue: n2-4-spot
+      queue: n2-4
     depends_on: build
     timeout_in_minutes: 120
     key: default-cigroup-docker
@@ -44,7 +44,7 @@ steps:
     label: 'OSS CI Group'
     parallelism: 11
     agents:
-      queue: n2-4-spot
+      queue: ci-group-4d
     depends_on: build
     timeout_in_minutes: 120
     key: oss-cigroup
@@ -98,7 +98,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_firefox.sh
     label: 'OSS Firefox Tests'
     agents:
-      queue: n2-4-spot
+      queue: ci-group-4d
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -130,7 +130,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_misc.sh
     label: 'OSS Misc Functional Tests'
     agents:
-      queue: n2-4-spot
+      queue: n2-4
     depends_on: build
     timeout_in_minutes: 120
     retry: