From 7116e1fe54e5d1f7cec9083f70e7bbdcc01c6d54 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Thu, 25 Jun 2026 18:28:58 +0000 Subject: [PATCH 1/3] chore(pubsub): remove Kokoro system tests for handwritten library This change removes the Kokoro configuration files and scripts for system tests in the pubsub handwritten library, aligning it with the bigtable library's configuration. Local system tests and other CI environments remain unaffected. --- .../.kokoro/continuous/node18/system-test.cfg | 12 ---- .../.kokoro/presubmit/node18/system-test.cfg | 12 ---- handwritten/pubsub/.kokoro/system-test.sh | 61 ------------------- handwritten/pubsub/.kokoro/trampoline_v2.sh | 2 +- 4 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg delete mode 100755 handwritten/pubsub/.kokoro/system-test.sh diff --git a/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg deleted file mode 100644 index 3da815140ffc..000000000000 --- a/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg deleted file mode 100644 index 3da815140ffc..000000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh deleted file mode 100755 index a90d5cfec89e..000000000000 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -# Copyright 2018 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -eo pipefail - -export NPM_CONFIG_PREFIX=${HOME}/.npm-global - -# Setup service account credentials. -export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secret_manager/long-door-651-kokoro-system-test-service-account -export GCLOUD_PROJECT=long-door-651 - -cd $(dirname $0)/.. - -# Run a pre-test hook, if a pre-system-test.sh is in the project -if [ -f .kokoro/pre-system-test.sh ]; then - set +x - . .kokoro/pre-system-test.sh - set -x -fi - -npm install - -# If tests are running against main branch, configure flakybot -# to open issues on failures: -if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then - export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml - export MOCHA_REPORTER=xunit - cleanup() { - chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot - $KOKORO_GFILE_DIR/linux_amd64/flakybot - } - trap cleanup EXIT HUP -fi - -npm run system-test - -# codecov combines coverage across integration and unit tests. Include -# the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=18 -if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then - NYC_BIN=./node_modules/nyc/bin/nyc.js - if [ -f "$NYC_BIN" ]; then - $NYC_BIN report || true - fi - bash $KOKORO_GFILE_DIR/codecov.sh -else - echo "coverage is only reported for Node $COVERAGE_NODE" -fi diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh index 682bdefdb061..75a0aa7ad513 100755 --- a/handwritten/pubsub/.kokoro/trampoline_v2.sh +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -45,7 +45,7 @@ # # Here is an example for running this script. # TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:18-user \ -# TRAMPOLINE_BUILD_FILE=.kokoro/system-test.sh \ +# TRAMPOLINE_BUILD_FILE=.kokoro/samples-test.sh \ # .kokoro/trampoline_v2.sh set -euo pipefail From ff27f7727b16dcb09ecbe207ebbb12de12cbc6f7 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Thu, 25 Jun 2026 15:57:37 -0400 Subject: [PATCH 2/3] Add more kokoro system test files to the excludes --- handwritten/pubsub/owlbot.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 67e7eb9d884a..7ee3806a3122 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -24,5 +24,8 @@ '.eslintignore', '.OwlBot.yaml', 'renovate.json', - "README.md" + "README.md", + ".kokoro/system-test.sh", + ".kokoro/continuous/node18/system-test.cfg", + ".kokoro/presubmit/node18/system-test.cfg", ]) From 641ab85c66ef1d5f24325d2ddf2ec80142a6d41d Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Fri, 26 Jun 2026 10:20:43 -0400 Subject: [PATCH 3/3] revert owlbot changes --- handwritten/pubsub/owlbot.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 7ee3806a3122..67e7eb9d884a 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -24,8 +24,5 @@ '.eslintignore', '.OwlBot.yaml', 'renovate.json', - "README.md", - ".kokoro/system-test.sh", - ".kokoro/continuous/node18/system-test.cfg", - ".kokoro/presubmit/node18/system-test.cfg", + "README.md" ])