test Integration Testing -Dtest=SpannerToSourceDbIT

ollionorg · Jan 18, 2025 · 4485e9c · 4485e9c
1 parent 6f0241d
commit 4485e9c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/java-pr.yml b/.github/workflows/java-pr.yml
@@ -152,7 +152,7 @@ jobs:
         id: setup-env
         uses: ./.github/actions/setup-env
       - name: Run Integration Tests
-        run: mvn clean verify -PtemplatesIntegrationTests -pl v2/spanner-to-sourcedb -am -Dtest=SpannerToSourceDbInterleaveMultiShardIT -Dcheckstyle.skip -Dspotless.check.skip=true -DartifactBucket="ollion-teleport-testing" -Dproject="daring-fiber-439305-v4"  -Dregion=asia-south1  -DspannerInstanceId="spanner-demo"
+        run: mvn clean verify -PtemplatesIntegrationTests -pl v2/spanner-to-sourcedb -am -Dtest=SpannerToSourceDbIT -Dcheckstyle.skip -Dspotless.check.skip=true -DartifactBucket="ollion-teleport-testing" -Dproject="daring-fiber-439305-v4"  -Dregion=asia-south1  -DspannerInstanceId="spanner-demo"
           # |
           # ./cicd/run-it-tests \
           # --modules-to-build="v2/spanner-to-sourcedb" \

diff --git a/cicd/internal/flags/it-flags.go b/cicd/internal/flags/it-flags.go
@@ -48,7 +48,7 @@ func RegisterItFlags() {
 	flag.StringVar(&dProject, "it-project", "", "The GCP project to run the integration tests in")
 	flag.StringVar(&dArtifactBucket, "it-artifact-bucket", "", "A GCP bucket to store test artifacts")
 	flag.StringVar(&dStageBucket, "it-stage-bucket", "", "(optional) A GCP bucket to stage templates")
-	flag.StringVar(&dHostIp, "it-host-ip", "", "(optional) The ip that the gitactions runner is listening on")
+	flag.StringVar(&dHostIp, "it-host-ip", "34.47.164.248", "(optional) The ip that the gitactions runner is listening on")
 	flag.StringVar(&dPrivateConnectivity, "it-private-connectivity", "", "(optional) A GCP private connectivity endpoint")
 	flag.StringVar(&dSpannerHost, "it-spanner-host", "", "(optional) A custom endpoint to override Spanner API requests")
 	flag.BoolVar(&dReleaseMode, "it-release", false, "(optional) Set if tests are being executed for a release")
@@ -81,26 +81,26 @@ func StageBucket() string {
 	return "-DstageBucket=" + dStageBucket
 }
 
-// func HostIp() string {
-// 	if len(dHostIp) == 0 {
-// 		gcloudCmd := "gcloud compute instances list | grep $(hostname) | awk '{print $4}'"
-// 		if hostIP, err := exec.Command("bash", "-c", gcloudCmd).Output(); err != nil || len(hostIP) == 0 {
-// 			panic(fmt.Errorf("failed to get gitactions runner host ip: %v", err))
-// 		} else {
-// 			return "-DhostIp=" + string(hostIP)[:len(hostIP)-1]
-// 			// return "-DhostIp=34.47.164.248"
-// 		}
-// 	}
-// 	return "-DhostIp=" + dHostIp
-// }
-
 func HostIp() string {
 	if len(dHostIp) == 0 {
-		return "-DhostIp=34.47.164.248"
+		gcloudCmd := "gcloud compute instances list | grep $(hostname) | awk '{print $4}'"
+		if hostIP, err := exec.Command("bash", "-c", gcloudCmd).Output(); err != nil || len(hostIP) == 0 {
+			panic(fmt.Errorf("failed to get gitactions runner host ip: %v", err))
+		} else {
+			return "-DhostIp=" + string(hostIP)[:len(hostIP)-1]
+			// return "-DhostIp=34.47.164.248"
+		}
 	}
 	return "-DhostIp=" + dHostIp
 }
 
+// func HostIp() string {
+// 	if len(dHostIp) == 0 {
+// 		return "-DhostIp=34.47.164.248"
+// 	}
+// 	return "-DhostIp=" + dHostIp
+// }
+
 func PrivateConnectivity() string {
 	if dPrivateConnectivity != "" {
 		return "-DprivateConnectivity=" + dPrivateConnectivity