isolation

Author: Sandeep Mishra

.github/workflows/spanner-pr.yml

@@ -54,34 +54,38 @@ env:
 permissions: write-all
 
 jobs:
-  spotless_check:
-    name: Spotless
-    timeout-minutes: 10
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - name: Setup Environment
-        id: setup-env
-        uses: ./.github/actions/setup-env
-      - name: Run Spotless
-        run: |
-          ./cicd/run-spotless \
-          --modules-to-build="SPANNER"
-  checkstyle_check:
-    name: Checkstyle
-    timeout-minutes: 10
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - name: Setup Environment
-        id: setup-env
-        uses: ./.github/actions/setup-env
-      - name: Run Checkstyle
-        run: |
-          ./cicd/run-checkstyle \
-          --modules-to-build="SPANNER"
+  # Temporarily disabled for faster debugging
+  # spotless_check:
+  #   name: Spotless
+  #   timeout-minutes: 10
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - name: Checkout Code
+  #     uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+  #   - name: Setup Environment
+  #     id: setup-env
+  #     uses: ./.github/actions/setup-env
+  #   - name: Run Spotless
+  #     run: |
+  #       ./cicd/run-spotless \
+  #       --modules-to-build="SPANNER"
+
+  # Temporarily disabled for faster debugging
+  # checkstyle_check:
+  #   name: Checkstyle
+  #   timeout-minutes: 10
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - name: Checkout Code
+  #     uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+  #   - name: Setup Environment
+  #     id: setup-env
+  #     uses: ./.github/actions/setup-env
+  #   - name: Run Checkstyle
+  #     run: |
+  #       ./cicd/run-checkstyle \
+  #       --modules-to-build="SPANNER"
+
   java_build:
     name: Build
     timeout-minutes: 60
@@ -117,7 +121,7 @@ jobs:
   #       --modules-to-build="SPANNER"
   #   - name: Upload Unit Tests Report
   #     uses: actions/upload-artifact@v4
-  #     if: always() # always run even if the previous step fails
+  #     if: always()
   #     with:
   #       name: surefire-unit-test-results
   #       path: |
@@ -134,44 +138,44 @@ jobs:
   #   - name: Cleanup Java Environment
   #     uses: ./.github/actions/cleanup-java-env
 
-  java_integration_smoke_tests_templates:
-    name: Dataflow Templates Integration Smoke Tests
-    # Updated 'needs' to remove java_unit_tests
-    needs: [spotless_check, checkstyle_check, java_build]
-    timeout-minutes: 60
-    # Run on any runner that matches all the specified runs-on values.
-    runs-on: [self-hosted, it]
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - name: Setup Environment
-        id: setup-env
-        uses: ./.github/actions/setup-env
-      - name: Run Integration Smoke Tests
-        run: |
-          ./cicd/run-it-smoke-tests \
-          --modules-to-build="SPANNER" \
-          --it-region="us-central1" \
-          --it-project="cloud-teleport-testing" \
-          --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
-          --it-private-connectivity="datastream-connect-2"
-      - name: Upload Smoke Tests Report
-        uses: actions/upload-artifact@v4
-        if: always() # always run even if the previous step fails
-        with:
-          name: surefire-smoke-test-results
-          path: |
-            **/surefire-reports/TEST-*.xml
-            **/surefire-reports/*.html
-            **/surefire-reports/html/**
-          retention-days: 1
-      - name: Cleanup Java Environment
-        uses: ./.github/actions/cleanup-java-env
+  # Temporarily disabled for faster debugging
+  # java_integration_smoke_tests_templates:
+  #   name: Dataflow Templates Integration Smoke Tests
+  #   needs: [spotless_check, checkstyle_check, java_build, java_unit_tests]
+  #   timeout-minutes: 60
+  #   runs-on: [self-hosted, it]
+  #   steps:
+  #   - name: Checkout Code
+  #     uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+  #   - name: Setup Environment
+  #     id: setup-env
+  #     uses: ./.github/actions/setup-env
+  #   - name: Run Integration Smoke Tests
+  #     run: |
+  #       ./cicd/run-it-smoke-tests \
+  #       --modules-to-build="SPANNER" \
+  #       --it-region="us-central1" \
+  #       --it-project="cloud-teleport-testing" \
+  #       --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
+  #       --it-private-connectivity="datastream-connect-2"
+  #   - name: Upload Smoke Tests Report
+  #     uses: actions/upload-artifact@v4
+  #     if: always()
+  #     with:
+  #       name: surefire-smoke-test-results
+  #       path: |
+  #         **/surefire-reports/TEST-*.xml
+  #         **/surefire-reports/*.html
+  #         **/surefire-reports/html/**
+  #       retention-days: 1
+  #   - name: Cleanup Java Environment
+  #     uses: ./.github/actions/cleanup-java-env
+
   java_integration_tests_templates:
     name: Dataflow Templates Integration Tests
-    needs: [java_integration_smoke_tests_templates]
+    # Updated dependencies to run directly after build
+    needs: [java_build]
     timeout-minutes: 180
-    # Run on any runner that matches all the specified runs-on values.
     runs-on: [self-hosted, it]
     steps:
       - name: Checkout Code
@@ -187,10 +191,11 @@ jobs:
           --it-project="cloud-teleport-testing" \
           --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
           --it-private-connectivity="datastream-connect-2" \
+          --it-module-to-test="v2/spanner-to-sourcedb" \
           --it-test-to-run="SpannerToSourceDbIT"
       - name: Upload Integration Tests Report
         uses: actions/upload-artifact@v4
-        if: always() # always run even if the previous step fails
+        if: always()
         with:
           name: surefire-integration-test-results
           path: |
@@ -215,10 +220,9 @@ jobs:
   java_load_tests_templates:
     if: contains(github.event.pull_request.labels.*.name, 'run-load-tests')
     name: Dataflow Templates Load Tests
-    # Updated 'needs' to remove java_unit_tests
-    needs: [spotless_check, checkstyle_check, java_build, java_integration_tests_templates]
+    # Updated dependencies
+    needs: [java_build, java_integration_tests_templates]
     timeout-minutes: 600
-    # Run on any runner that matches all the specified runs-on values.
     runs-on: [self-hosted, perf]
     steps:
       - name: Checkout Code

cicd/cmd/run-it-tests/main.go

@@ -69,6 +69,7 @@ func main() {
 		flags.FailureMode(),
 		flags.RetryFailures(),
 		flags.TestToRun(), // ADD THIS LINE TO USE THE NEW FLAG
+		flags.ModuleToTest(),
 		flags.StaticOracleHost(),
 		flags.StaticOracleSysPassword(),
 		flags.CloudProxyHost(),

cicd/internal/flags/it-flags.go

@@ -43,6 +43,7 @@ var (
 	dIntegrationTestParallelism         string
 	dThreadCount                        string
 	dTestToRun                          string // 1. ADD THIS VARIABLE
+	dModuleToTest                       string // 1. ADD THIS VARIABLE
 )
 
 // Registers all it flags. Must be called before flag.Parse().
@@ -68,6 +69,7 @@ func RegisterItFlags() {
 
 	// 2. ADD THIS FLAG REGISTRATION
 	flag.StringVar(&dTestToRun, "it-test-to-run", "", "The specific integration test class to run")
+	flag.StringVar(&dModuleToTest, "it-module-to-test", "", "The specific module to run tests against") // 2. ADD THIS FLAG REGISTRATION
 }
 
 func Region() string {
@@ -179,3 +181,13 @@ func TestToRun() string {
 	}
 	return ""
 }
+
+// 3. ADD THIS ACCESSOR FUNCTION
+func ModuleToTest() string {
+	if dModuleToTest != "" {
+		// -pl tells Maven to build only this project
+		// -am tells Maven to also build any dependencies it needs
+		return "-pl " + dModuleToTest + " -am"
+	}
+	return ""
+}