Merge integration tests so that we under the limit of 80 tasks.

Oterwise, CI fails with
"The number of tasks in one config file is limited to 80!"

Author: Rasrack

.bazelci/presubmit.yml

@@ -435,6 +435,12 @@ tasks:
     - "! git diff --exit-code"
     - "bazel run //:requirements.update"
     - "git diff --exit-code"
+    # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
+    # right thing.
+    - "echo '' > requirements_lock_linux.txt"
+    - "! git diff --exit-code"
+    - "bazel run //:os_specific_requirements.update"
+    - "git diff --exit-code"
   integration_test_compile_pip_requirements_debian:
     <<: *reusable_build_test_all
     name: compile_pip_requirements integration tests on Debian
@@ -447,6 +453,12 @@ tasks:
     - "! git diff --exit-code"
     - "bazel run //:requirements.update"
     - "git diff --exit-code"
+    # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
+    # right thing.
+    - "echo '' > requirements_lock_linux.txt"
+    - "! git diff --exit-code"
+    - "bazel run //:os_specific_requirements.update"
+    - "git diff --exit-code"
   integration_test_compile_pip_requirements_macos:
     <<: *reusable_build_test_all
     name: compile_pip_requirements integration tests on macOS
@@ -459,6 +471,12 @@ tasks:
     - "! git diff --exit-code"
     - "bazel run //:requirements.update"
     - "git diff --exit-code"
+    # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
+    # right thing.
+    - "echo '' > requirements_lock_darwin.txt"
+    - "! git diff --exit-code"
+    - "bazel run //:os_specific_requirements.update"
+    - "git diff --exit-code"
   integration_test_compile_pip_requirements_windows:
     <<: *reusable_build_test_all
     name: compile_pip_requirements integration tests on Windows
@@ -471,48 +489,6 @@ tasks:
     - "! git diff --exit-code"
     - "bazel run //:requirements.update"
     - "git diff --exit-code"
-  integration_test_compile_pip_os_specific_requirements_ubuntu:
-    <<: *reusable_build_test_all
-    name: compile_pip_os_specific_requirements integration tests on Ubuntu
-    working_directory: tests/compile_pip_requirements
-    platform: ubuntu2004
-    shell_commands:
-    # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
-    # right thing.
-    - "echo '' > requirements_lock_linux.txt"
-    - "! git diff --exit-code"
-    - "bazel run //:os_specific_requirements.update"
-    - "git diff --exit-code"
-  integration_test_compile_pip_os_specific_requirements_debian:
-    <<: *reusable_build_test_all
-    name: compile_pip_os_specific_requirements integration tests on Debian
-    working_directory: tests/compile_pip_requirements
-    platform: debian11
-    shell_commands:
-    # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
-    # right thing.
-    - "echo '' > requirements_lock_linux.txt"
-    - "! git diff --exit-code"
-    - "bazel run //:os_specific_requirements.update"
-    - "git diff --exit-code"
-  integration_test_compile_pip_os_specific_requirements_macos:
-    <<: *reusable_build_test_all
-    name: compile_pip_os_specific_requirements integration tests on macOS
-    working_directory: tests/compile_pip_requirements
-    platform: macos
-    shell_commands:
-    # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
-    # right thing.
-    - "echo '' > requirements_lock_darwin.txt"
-    - "! git diff --exit-code"
-    - "bazel run //:os_specific_requirements.update"
-    - "git diff --exit-code"
-  integration_test_compile_pip_os_specific_requirements_windows:
-    <<: *reusable_build_test_all
-    name: compile_pip_os_specific_requirements integration tests on Windows
-    working_directory: tests/compile_pip_requirements
-    platform: windows
-    shell_commands:
     # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
     # right thing.
     - "echo '' > requirements_lock_windows.txt"