ci: update CI and some tests to enable this branch to work with current services (#15028)

* ci: update CI and some tests to enable this branch to work with current services

* delete builds for obsolete OS versions

Author: scotthart

ci/cloudbuild/convert-to-branch-triggers.sh

@@ -41,7 +41,10 @@ function convert_triggers() {
   for file in "$@"; do
     sed -i \
       -e "s/^name: /name: ${name_prefix}-/" \
-      -e "s/branch: .*/branch: ${branch}/" "${file}"
+      -e "s/branch: .*/branch: ${branch}/" "${file}" \
+      -e "/^createTime: /d" \
+      -e "/^id: /d" \
+      -e "/^resourceName: /d"
   done
 }
 export -f convert_triggers
@@ -98,5 +101,7 @@ if [[ -z "${BRANCH}" ]]; then
   BRANCH="$(parent)"
 fi
 
+# We want to pass the string as-is, not expand the variables therein.
+# shellcheck disable=SC2016
 git ls-files -z -- ci/cloudbuild/triggers/*.yaml |
-  xargs -P "$(nproc)" -n 10 -0 bash -c "convert_triggers \"${BRANCH}\" \"\$@\""
+  xargs -P "$(nproc)" -n 10 -0 bash -c 'convert_triggers "${BRANCH}" "$@"' _

ci/cloudbuild/triggers/asan-ci.yaml

@@ -1,14 +1,11 @@
-createTime: '2021-03-22T00:38:08.167137222Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: a803727d-8633-49ea-b545-bd7f9124bc3d
+    branch: v2.22.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: asan-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/a803727d-8633-49ea-b545-bd7f9124bc3d
+name: v2-22-x-asan-ci
 substitutions:
   _BUILD_NAME: asan
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/asan-pr.yaml

@@ -1,15 +1,12 @@
-createTime: '2021-04-09T18:15:26.533760362Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
     branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 45fd50c2-04f1-4674-b533-0db1346c8b7e
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-asan-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/45fd50c2-04f1-4674-b533-0db1346c8b7e
 substitutions:
   _BUILD_NAME: asan
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/bazel-oldest-ci.yaml

@@ -1,14 +1,11 @@
-createTime: '2022-02-08T12:44:34.878690706Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
     branch: v2.22.x
-id: 3a7690ee-a385-4e86-835e-990a64eb71d7
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-bazel-oldest-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3a7690ee-a385-4e86-835e-990a64eb71d7
 substitutions:
   _BUILD_NAME: bazel-oldest
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/bazel-oldest-pr.yaml

@@ -1,15 +1,12 @@
-createTime: '2022-02-08T12:44:28.719440875Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
     branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 914bc7a4-afa2-4faf-8a0e-571218e8fd83
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-bazel-oldest-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/914bc7a4-afa2-4faf-8a0e-571218e8fd83
 substitutions:
   _BUILD_NAME: bazel-oldest
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml

@@ -5,10 +5,8 @@ github:
   pullRequest:
     branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: abfbaa6f-e1a0-4298-af45-78f9dc1a9831
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-bazel-otel-abi-2-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/abfbaa6f-e1a0-4298-af45-78f9dc1a9831
 substitutions:
   _BUILD_NAME: bazel-otel-abi-2
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml

@@ -5,10 +5,8 @@ github:
   pullRequest:
     branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 18b11d89-0625-40ba-897a-ac10462d1c7b
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-bazel-otel-abi-2-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/18b11d89-0625-40ba-897a-ac10462d1c7b
 substitutions:
   _BUILD_NAME: bazel-otel-abi-2
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/bazel-targets-ci.yaml

@@ -1,14 +1,11 @@
-createTime: '2021-04-26T16:37:27.818296611Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
     branch: v2.22.x
-id: 1f63c286-589b-41cf-aee0-dd0e3cb6861c
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-bazel-targets-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/1f63c286-589b-41cf-aee0-dd0e3cb6861c
 substitutions:
   _BUILD_NAME: bazel-targets
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/bazel-targets-pr.yaml

@@ -1,15 +1,12 @@
-createTime: '2021-04-26T16:37:32.709851004Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
     branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 95e11a96-2138-4d65-8598-25308f1cf5f8
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-bazel-targets-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/95e11a96-2138-4d65-8598-25308f1cf5f8
 substitutions:
   _BUILD_NAME: bazel-targets
   _DISTRO: fedora-latest-bazel

ci/cloudbuild/triggers/check-api-ci.yaml

@@ -1,14 +1,11 @@
-createTime: '2021-04-30T13:51:14.389552861Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
     branch: v2.22.x
-id: 83b375fa-9209-4691-8dcc-a28f7a19dcf2
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
 name: v2-22-x-check-api-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/83b375fa-9209-4691-8dcc-a28f7a19dcf2
 substitutions:
   _BUILD_NAME: check-api
   _DISTRO: fedora-latest-cmake