Skip to content

Commit 254a83e

Browse files
authored
added it-integration-test-parallelism and set this to 6 (#2483)
1 parent fb0809d commit 254a83e

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

.github/workflows/java-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ jobs:
170170
--modules-to-build="DEFAULT" \
171171
--it-region="${{ env.IT_REGION }}" \
172172
--it-project="cloud-teleport-testing" \
173+
--it-integration-test-parallelism=6 \
173174
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
174175
--it-private-connectivity="datastream-private-connect-us-central1"
175176
- name: Upload Integration Tests Report

.github/workflows/release.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
release:
2525
name: Create Release
2626
runs-on: [self-hosted, release]
27+
env:
28+
IT_REGION: us-west2
2729
steps:
2830
- name: Get releaser identity
2931
run: |
@@ -84,7 +86,7 @@ jobs:
8486
- name: Run Integration Smoke Tests
8587
run: |
8688
./cicd/run-it-smoke-tests \
87-
--it-region="us-central1" \
89+
--it-region="${{ env.IT_REGION }}" \
8890
--it-project="cloud-teleport-testing" \
8991
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
9092
--it-private-connectivity="datastream-private-connect-us-central1" \
@@ -94,35 +96,38 @@ jobs:
9496
- name: Run Integration Tests With DEFAULT
9597
run: |
9698
./cicd/run-it-tests \
97-
--it-region="us-central1" \
99+
--it-region="${{ env.IT_REGION }}" \
98100
--it-project="cloud-teleport-testing" \
99101
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
100102
--it-private-connectivity="datastream-private-connect-us-central1" \
101103
--it-spanner-host="https://batch-spanner.googleapis.com" \
102104
--it-release=true \
103105
--it-retry-failures=2 \
106+
--it-integration-test-parallelism=6 \
104107
--modules-to-build="DEFAULT"
105108
- name: Run Integration Tests With KAFKA
106109
run: |
107110
./cicd/run-it-tests \
108-
--it-region="us-central1" \
111+
--it-region="${{ env.IT_REGION }}" \
109112
--it-project="cloud-teleport-testing" \
110113
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
111114
--it-private-connectivity="datastream-private-connect-us-central1" \
112115
--it-spanner-host="https://batch-spanner.googleapis.com" \
113116
--it-release=true \
114117
--it-retry-failures=2 \
118+
--it-integration-test-parallelism=6 \
115119
--modules-to-build="KAFKA"
116120
- name: Run Integration Tests With BIGTABLE
117121
run: |
118122
./cicd/run-it-tests \
119-
--it-region="us-central1" \
123+
--it-region="${{ env.IT_REGION }}" \
120124
--it-project="cloud-teleport-testing" \
121125
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
122126
--it-private-connectivity="datastream-private-connect-us-central1" \
123127
--it-spanner-host="https://batch-spanner.googleapis.com" \
124128
--it-release=true \
125129
--it-retry-failures=2 \
130+
--it-integration-test-parallelism=6 \
126131
--modules-to-build="BIGTABLE"
127132
- name: Upload Site Report
128133
uses: ./.github/actions/publish-site-report

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func main() {
5757
mvnFlags.SkipShade(),
5858
mvnFlags.RunIntegrationTests(flags.UnifiedWorkerHarnessContainerImage() != ""),
5959
mvnFlags.ThreadCount(4),
60-
mvnFlags.IntegrationTestParallelism(3),
60+
mvnFlags.IntegrationTestParallelism(flags.IntegrationTestParallelism()),
6161
mvnFlags.StaticBigtableInstance("teleport"),
6262
mvnFlags.StaticSpannerInstance("teleport"),
6363
mvnFlags.InternalMaven(),

cicd/internal/flags/it-flags.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ var (
4040
dOracleHost string
4141
dCloudOracleSysPassword string
4242
dUnifiedWorkerHarnessContainerImage string
43+
dIntegrationTestParallelism string
4344
)
4445

4546
// Registers all it flags. Must be called before flag.Parse().
@@ -60,6 +61,7 @@ func RegisterItFlags() {
6061
flag.StringVar(&dOracleHost, "it-oracle-host", "10.128.0.90", "Hostname or IP address of static Oracle DB")
6162
flag.StringVar(&dCloudOracleSysPassword, "it-oracle-sys-password", "oracle", "sys password of static Oracle DB")
6263
flag.StringVar(&dUnifiedWorkerHarnessContainerImage, "it-unified-worker-harness-container-image", "", "Runner harness image to run tests against")
64+
flag.StringVar(&dIntegrationTestParallelism, "it-integration-test-parallelism", "3", "The level of parallelism for integration tests")
6365
}
6466

6567
func Region() string {
@@ -151,3 +153,9 @@ func UnifiedWorkerHarnessContainerImage() string {
151153
}
152154
return ""
153155
}
156+
157+
func IntegrationTestParallelism() int {
158+
i := 3
159+
fmt.Sscan(dIntegrationTestParallelism, &i)
160+
return i
161+
}

0 commit comments

Comments
 (0)