From 764a3cbe9417db64c4c39050b19958feeddd7a51 Mon Sep 17 00:00:00 2001
From: Alka Trivedi <alkatrivedi12dec@gmail.com>
Date: Tue, 14 Jul 2026 01:39:17 +0530
Subject: [PATCH] fix(spanner): system test against regular sessions

---
 handwritten/spanner/cloudbuild-regular-sessions.yaml | 1 +
 handwritten/spanner/system-test/spanner.ts           | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/handwritten/spanner/cloudbuild-regular-sessions.yaml b/handwritten/spanner/cloudbuild-regular-sessions.yaml
index d3d9d84d142b..705cccefcc99 100644
--- a/handwritten/spanner/cloudbuild-regular-sessions.yaml
+++ b/handwritten/spanner/cloudbuild-regular-sessions.yaml
@@ -27,6 +27,7 @@ steps:
   dir: 'handwritten/spanner'
   env:
   - 'GCLOUD_PROJECT=${_GCP_PROJECT_ID}' # Pass project ID via build variable
+  - 'TRIGGER_NAME=${TRIGGER_NAME}'
   # If you need specific credentials from Secret Manager, uncomment these:
   # - 'GOOGLE_APPLICATION_CREDENTIALS=/secrets/sa-key.json'
   - 'GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS=false'
diff --git a/handwritten/spanner/system-test/spanner.ts b/handwritten/spanner/system-test/spanner.ts
index 57589c056b4d..1dd203dca6b2 100644
--- a/handwritten/spanner/system-test/spanner.ts
+++ b/handwritten/spanner/system-test/spanner.ts
@@ -62,7 +62,7 @@ import {isNull, isNumber, isUuid} from '../src/helper';
 const fs = require('fs');
 
 const SKIP_BACKUPS = process.env.SKIP_BACKUPS;
-const KOKORO_JOB_NAME = process.env.KOKORO_JOB_NAME;
+const TRIGGER_NAME = process.env.TRIGGER_NAME;
 const SKIP_FGAC_TESTS = (process.env.SKIP_FGAC_TESTS || 'false').toLowerCase();
 
 const IAM_MEMBER = process.env.IAM_MEMBER;
@@ -558,7 +558,7 @@ describe('Spanner', () => {
         await table.insert({BoolValue: 'abc'});
         assert.fail('Expected an error to be thrown, but it was not.');
       } catch (err: any) {
-        KOKORO_JOB_NAME?.includes('system-test-regular-session')
+        TRIGGER_NAME?.includes('regular-sessions')
           ? assert.strictEqual(err.code, grpc.status.FAILED_PRECONDITION)
           : assert.strictEqual(err.code, grpc.status.INVALID_ARGUMENT);
       }
@@ -1199,7 +1199,7 @@ describe('Spanner', () => {
           await insert({NumericValue: value}, dialect);
           assert.fail('Expected an error to be thrown, but it was not.');
         } catch (err: any) {
-          KOKORO_JOB_NAME?.includes('system-test-regular-session')
+          TRIGGER_NAME?.includes('regular-sessions')
             ? assert.ok(
                 err.code === grpc.status.FAILED_PRECONDITION ||
                   err.code === grpc.status.OUT_OF_RANGE,
@@ -2965,7 +2965,7 @@ describe('Spanner', () => {
       if (IS_EMULATOR_ENABLED) {
         this.skip();
       }
-      if (SKIP_BACKUPS === 'true' || KOKORO_JOB_NAME?.includes('presubmit')) {
+      if (SKIP_BACKUPS === 'true') {
         this.skip();
       }
       googleSqlDatabase1 = DATABASE;