From 2b53e86f588bb6544159b947ac0ee6da419ad726 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Thu, 25 Jun 2026 18:39:44 +0000 Subject: [PATCH 1/4] test: remove kokoro system tests for logging --- .../.kokoro/continuous/node14/system-test.cfg | 12 ---- .../.kokoro/presubmit/node14/system-test.cfg | 12 ---- handwritten/logging/.kokoro/system-test.sh | 61 ------------------- handwritten/logging/.kokoro/trampoline_v2.sh | 2 +- handwritten/logging/owlbot.py | 10 ++- 5 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 handwritten/logging/.kokoro/continuous/node14/system-test.cfg delete mode 100644 handwritten/logging/.kokoro/presubmit/node14/system-test.cfg delete mode 100755 handwritten/logging/.kokoro/system-test.sh diff --git a/handwritten/logging/.kokoro/continuous/node14/system-test.cfg b/handwritten/logging/.kokoro/continuous/node14/system-test.cfg deleted file mode 100644 index 9d3b97c982d2..000000000000 --- a/handwritten/logging/.kokoro/continuous/node14/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-logging/handwritten/logging/.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/logging/.kokoro/presubmit/node14/system-test.cfg b/handwritten/logging/.kokoro/presubmit/node14/system-test.cfg deleted file mode 100644 index 9d3b97c982d2..000000000000 --- a/handwritten/logging/.kokoro/presubmit/node14/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-logging/handwritten/logging/.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/logging/.kokoro/system-test.sh b/handwritten/logging/.kokoro/system-test.sh deleted file mode 100755 index 0b3043d268cb..000000000000 --- a/handwritten/logging/.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=14 -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/logging/.kokoro/trampoline_v2.sh b/handwritten/logging/.kokoro/trampoline_v2.sh index ce3e779c7889..7dcebfd37b5a 100755 --- a/handwritten/logging/.kokoro/trampoline_v2.sh +++ b/handwritten/logging/.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:10-user \ -# TRAMPOLINE_BUILD_FILE=.kokoro/system-test.sh \ +# TRAMPOLINE_BUILD_FILE=.kokoro/samples-test.sh \ # .kokoro/trampoline_v2.sh set -euo pipefail diff --git a/handwritten/logging/owlbot.py b/handwritten/logging/owlbot.py index 4c5cc2efb516..c0503ab2f3e7 100644 --- a/handwritten/logging/owlbot.py +++ b/handwritten/logging/owlbot.py @@ -22,7 +22,10 @@ staging_excludes=[ ".eslintignore", ".prettierignore", "src/index.ts", "README.md", "package.json", "system-test/fixtures/sample/src/index.js", - "system-test/fixtures/sample/src/index.ts"], + "system-test/fixtures/sample/src/index.ts", + ".kokoro/system-test.sh", + ".kokoro/continuous/node14/system-test.cfg", + ".kokoro/presubmit/node14/system-test.cfg"], templates_excludes=[ "src/index.ts", ".eslintignore", @@ -32,7 +35,10 @@ ".github/release-please.yml", ".github/CODEOWNERS", ".github/sync-repo-settings.yaml", - "README.md" + "README.md", + ".kokoro/system-test.sh", + ".kokoro/continuous/node14/system-test.cfg", + ".kokoro/presubmit/node14/system-test.cfg" ] ) From 55976e3bdcf1ac801bd38455948807fb894bc6e4 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Fri, 26 Jun 2026 09:53:13 -0400 Subject: [PATCH 2/4] remove kokoro scripts --- handwritten/logging/owlbot.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/handwritten/logging/owlbot.py b/handwritten/logging/owlbot.py index c0503ab2f3e7..5e2b31ba4d98 100644 --- a/handwritten/logging/owlbot.py +++ b/handwritten/logging/owlbot.py @@ -35,10 +35,7 @@ ".github/release-please.yml", ".github/CODEOWNERS", ".github/sync-repo-settings.yaml", - "README.md", - ".kokoro/system-test.sh", - ".kokoro/continuous/node14/system-test.cfg", - ".kokoro/presubmit/node14/system-test.cfg" + "README.md" ] ) From d4cd987d72f1495edcb908e1bd68c66d76f24d8d Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Fri, 26 Jun 2026 10:05:11 -0400 Subject: [PATCH 3/4] remove the kokoro staging files --- handwritten/logging/owlbot.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/handwritten/logging/owlbot.py b/handwritten/logging/owlbot.py index 5e2b31ba4d98..4c5cc2efb516 100644 --- a/handwritten/logging/owlbot.py +++ b/handwritten/logging/owlbot.py @@ -22,10 +22,7 @@ staging_excludes=[ ".eslintignore", ".prettierignore", "src/index.ts", "README.md", "package.json", "system-test/fixtures/sample/src/index.js", - "system-test/fixtures/sample/src/index.ts", - ".kokoro/system-test.sh", - ".kokoro/continuous/node14/system-test.cfg", - ".kokoro/presubmit/node14/system-test.cfg"], + "system-test/fixtures/sample/src/index.ts"], templates_excludes=[ "src/index.ts", ".eslintignore", From e07bffd52bc1350c5c137200c69ec6a0f73a49d1 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Fri, 26 Jun 2026 11:07:06 -0400 Subject: [PATCH 4/4] =?UTF-8?q?Don=E2=80=99t=20exclude=20the=20kokoro=20te?= =?UTF-8?q?sts=20from=20logging?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/logging/owlbot.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/handwritten/logging/owlbot.py b/handwritten/logging/owlbot.py index c0503ab2f3e7..2f695937b908 100644 --- a/handwritten/logging/owlbot.py +++ b/handwritten/logging/owlbot.py @@ -22,10 +22,7 @@ staging_excludes=[ ".eslintignore", ".prettierignore", "src/index.ts", "README.md", "package.json", "system-test/fixtures/sample/src/index.js", - "system-test/fixtures/sample/src/index.ts", - ".kokoro/system-test.sh", - ".kokoro/continuous/node14/system-test.cfg", - ".kokoro/presubmit/node14/system-test.cfg"], + "system-test/fixtures/sample/src/index.ts"], templates_excludes=[ "src/index.ts", ".eslintignore",