Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit b7747f9
Author: nasir19noor <[email protected]>
Date:   Sun Jan 19 16:20:37 2025 +0700

    revert back java-pr.yml

commit a4d4184
Author: nasir19noor <[email protected]>
Date:   Sun Jan 19 00:34:02 2025 +0700

    test all

commit 6397cb7
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 23:50:54 2025 +0700

    build & Unit testing add -pl v2/spanner-to-sourcedb

commit 9fd29c4
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 23:18:53 2025 +0700

    build & Unit testing

commit 08a4bed
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 23:06:23 2025 +0700

    build test

commit 1444644
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 17:03:18 2025 +0700

    IT and LT

commit c65882c
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 16:25:21 2025 +0700

    test Integration Testing revert to initial code

commit 4485e9c
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 14:53:41 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbIT

commit 6f0241d
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 14:43:02 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbInterleaveMultiShardIT change hotsIP

commit ed8a496
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 14:05:53 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbInterleaveMultiShardIT increase timeout

commit e0f613d
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 13:32:31 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbInterleaveMultiShardIT

commit ae7a17d
Author: nasir19noor <[email protected]>
Date:   Sat Jan 18 12:24:00 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbDatatypeIT

commit 5f474a2
Author: nasir19noor <[email protected]>
Date:   Fri Jan 17 21:59:31 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbCustomShardIT

commit 80d258a
Author: nasir19noor <[email protected]>
Date:   Fri Jan 17 14:18:33 2025 +0700

    test Integration Testing

commit 8b06229
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 23:27:36 2025 +0700

    update bigquery value

commit 8ac600b
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 23:21:41 2025 +0700

    update bigquery value

commit e900037
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 22:16:48 2025 +0700

    revert back BigQuery conf

commit 543c73a
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 22:05:56 2025 +0700

    modify export bigquery

commit f89e3de
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 21:23:19 2025 +0700

    solve bigquery tabl

commit 3551c59
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 20:28:11 2025 +0700

    solve bigquery issue

commit eac6cca
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 19:39:35 2025 +0700

    decrease streaming data

commit 51a4e2e
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 17:03:36 2025 +0700

    load test: add specific module:spanner-to-cassandra 2

commit dfcb9de
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 16:46:27 2025 +0700

    load test: add specific module:spanner-to-cassandra

commit 2229233
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 16:07:38 2025 +0700

    Load Test: revert back SpannerToSourceDbCustomShardLT.java

commit 5eab9b6
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 16:03:07 2025 +0700

    Load Test: reduce dataflow jobs and workder node 2 modify format

commit 29a071f
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 15:39:59 2025 +0700

    Load Test: reduce dataflow jobs and workder node

commit 964cc52
Author: taherkl <[email protected]>
Date:   Thu Jan 16 11:41:07 2025 +0530

    update load test with lower config

commit dfc315b
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 12:35:32 2025 +0700

    modify load test

commit cedd703
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 08:55:51 2025 +0700

    IT use command form google(modified)

commit 7ba3c38
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 08:10:38 2025 +0700

    IT use command form google(modified)

commit a1dcae7
Author: nasir19noor <[email protected]>
Date:   Thu Jan 16 00:08:45 2025 +0700

    use IT command from Google

commit 3c8b375
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 23:45:16 2025 +0700

    modify run it test main.go

commit 93e3d21
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 23:41:32 2025 +0700

    modify host IP

commit 70481f2
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 23:32:05 2025 +0700

    modify IT to initial

commit bbb61cd
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 23:27:47 2025 +0700

    modify IT to initial

commit 40d23bf
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 23:24:47 2025 +0700

    modify IT to initial

commit c6334db
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 22:47:45 2025 +0700

    modify IT command 4

commit a0b6ded
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 22:33:49 2025 +0700

    modify IT command 3

commit dbfec41
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 22:00:12 2025 +0700

    modify IT command 2

commit b6f5761
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 21:43:30 2025 +0700

    modify IT command

commit 409200b
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 21:16:55 2025 +0700

    exclude build and unit test

commit c19e1a0
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 20:46:29 2025 +0700

    exclude tags perf on load test

commit 1e0bf31
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 19:36:13 2025 +0700

    exclude build dependency

commit bf1c3d7
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 18:01:33 2025 +0700

    modify the format

commit 783f00f
Author: nasir19noor <[email protected]>
Date:   Wed Jan 15 17:08:30 2025 +0700

    modify it test main.go

commit b019935
Author: Nasir Noor <[email protected]>
Date:   Wed Jan 15 16:50:27 2025 +0700

    revert back it-flags.go

commit f10b6ce
Author: Nasir Noor <[email protected]>
Date:   Wed Jan 15 16:28:59 2025 +0700

    add spanner-demo instance id

commit 49942e7
Author: Nasir Noor <[email protected]>
Date:   Wed Jan 15 16:20:08 2025 +0700

    temp - exclude unit test dependency

commit c6278b5
Author: Nasir Noor <[email protected]>
Date:   Wed Jan 15 14:58:49 2025 +0700

    include mysql cred

commit c5b8103
Author: Nasir Noor <[email protected]>
Date:   Wed Jan 15 08:21:35 2025 +0700

    exclude unnecessary parameter, only spanner is requird

commit ca1ea25
Author: Nasir Noor <[email protected]>
Date:   Wed Jan 15 00:30:30 2025 +0700

    change spanner instance id spanner-demo

commit 1db2c82
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 22:27:26 2025 +0700

    change spanner instance id

commit bea9422
Author: nasir19noor <[email protected]>
Date:   Tue Jan 14 21:02:47 2025 +0700

    remove comment

commit 362443f
Author: nasir19noor <[email protected]>
Date:   Tue Jan 14 19:01:45 2025 +0700

    test codecov

commit 54907b0
Author: nasir19noor <[email protected]>
Date:   Tue Jan 14 18:54:17 2025 +0700

    remove backup file

commit b1543cf
Author: nasir19noor <[email protected]>
Date:   Tue Jan 14 18:50:59 2025 +0700

    remove backup file

commit 09dd1e1
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 17:53:45 2025 +0700

    modify project, bucket in IT

commit 8ec0f2a
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 15:48:13 2025 +0700

    v2/spanner-to-sourcedb project for IT

commit 63449d9
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 14:29:43 2025 +0700

    v2/spanner-to-sourcedb project

commit 603d28f
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 12:37:48 2025 +0700

    spanner-to-sourcedb project

commit f786250
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 12:23:05 2025 +0700

    handle only spanner-to-sourcedb project

commit 220d8fb
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 11:30:33 2025 +0700

    update Run IT Smoke tests ./cicd/run-it-smoke-tests \

commit 4bb4028
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 10:40:49 2025 +0700

    add v2/spanner-to-sourcedb/.mvn

commit 69463e6
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 10:08:14 2025 +0700

    update integration test work only spanner-to-sourcedb

commit 6cedb8a
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 08:02:22 2025 +0700

    remove modules googlecloud-to-googleclou

commit 552a171
Author: Nasir Noor <[email protected]>
Date:   Tue Jan 14 07:50:47 2025 +0700

    remove modules keep spanner-to-sourcedb

commit f8a7f5b
Author: nasir19noor <[email protected]>
Date:   Fri Jan 10 17:06:33 2025 +0700

    exclude v1

commit 0e35d9e
Author: nasir19noor <[email protected]>
Date:   Fri Jan 10 15:52:05 2025 +0700

    revert back UT and IT

commit 20371fb
Author: nasir19noor <[email protected]>
Date:   Fri Jan 10 14:14:33 2025 +0700

    modify integration smoke test steps to use own bucket, project

commit 47ae923
Author: nasir19noor <[email protected]>
Date:   Fri Jan 10 08:53:57 2025 +0700

    revert back surefire version

commit 954d5ec
Author: nasir19noor <[email protected]>
Date:   Thu Jan 9 20:33:31 2025 +0700

    remove execution block v1/pom.xml

commit 38747bf
Author: nasir19noor <[email protected]>
Date:   Thu Jan 9 16:33:52 2025 +0700

    modify surefire version

commit d38a591
Author: nasir19noor <[email protected]>
Date:   Thu Jan 9 13:46:15 2025 +0700

    remove java-pr copy.yml

commit bf2ec2b
Author: nasir19noor <[email protected]>
Date:   Thu Jan 9 13:06:50 2025 +0700

    update workflow to work only for spanner-to-sourcedb

commit b0d7724
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 23:08:27 2025 +0700

    revert back

commit 0ff10d6
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 16:19:26 2025 +0700

    surefire plugin testing

commit 6232d27
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 16:12:21 2025 +0700

    surefire plugin testing

commit 6ed8195
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 15:14:15 2025 +0700

    revert back main.go

commit 9a0c4a2
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 15:10:42 2025 +0700

    modify cicd/cmd/run-unit-test/main.go for testing

commit db75fa5
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 12:27:39 2025 +0700

    revert back

commit b85f4ce
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 09:30:59 2025 +0700

    increase memory for run unit test stage

commit f5a6599
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 08:23:30 2025 +0700

    revert back

commit 0708902
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 08:15:31 2025 +0700

    revert back run-unit-test

commit 62965d2
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 08:12:20 2025 +0700

    modify run-unit-test line 45

commit 8d6e777
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 08:10:14 2025 +0700

    modify run-unit-test line 43

commit 284603c
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 08:06:29 2025 +0700

    modify run-unit-test

commit 394c477
Author: nasir19noor <[email protected]>
Date:   Wed Jan 8 07:49:29 2025 +0700

    modify maven surefire plugin

commit d87ccfc
Author: nasir19noor <[email protected]>
Date:   Tue Jan 7 23:27:38 2025 +0700

    modify maven registry

commit 7076172
Author: taherkl <[email protected]>
Date:   Tue Jan 7 18:34:18 2025 +0530

    actions change

commit ef5ae8d
Merge: ae3037a 23be7bc
Author: Taher Lakdawala <[email protected]>
Date:   Tue Jan 7 11:23:23 2025 +0530

    Merge pull request #48 from GoogleCloudPlatform/main

    Metadata config and pipeline options (GoogleCloudPlatform#2081)

commit ae3037a
Merge: 0d140e6 0a9fcec
Author: Taher Lakdawala <[email protected]>
Date:   Tue Jan 7 11:05:26 2025 +0530

    Merge pull request #46 from GoogleCloudPlatform/main

    Sync main branch

commit 0d140e6
Merge: 407a593 5b0c2cd
Author: Taher Lakdawala <[email protected]>
Date:   Thu Jan 2 15:19:25 2025 +0530

    Merge pull request #40 from GoogleCloudPlatform/main

    Sync main branch

commit 407a593
Merge: e53e8e4 587fc05
Author: Taher Lakdawala <[email protected]>
Date:   Mon Dec 30 10:54:16 2024 +0530

    Merge pull request #36 from GoogleCloudPlatform/main

    Sync main branch

commit e53e8e4
Merge: f618128 177a218
Author: Akash Thawait <[email protected]>
Date:   Thu Dec 26 10:54:05 2024 +0530

    Merge pull request #32 from GoogleCloudPlatform/main

    Sync main branch

commit f618128
Merge: 04bac39 8e7ae4f
Author: Akash Thawait <[email protected]>
Date:   Mon Dec 23 16:38:26 2024 +0530

    Merge pull request #29 from GoogleCloudPlatform/main

    Use [self-hosted, it] for prepare java cache workflow (GoogleCloudPlatform#2080)

commit 04bac39
Merge: 5aa21dc edee6a7
Author: Taher Lakdawala <[email protected]>
Date:   Fri Dec 20 17:51:12 2024 +0530

    Merge pull request #28 from GoogleCloudPlatform/main

    Sync main branch

commit 5aa21dc
Merge: 7512825 1bae9ad
Author: Taher Lakdawala <[email protected]>
Date:   Wed Dec 18 18:18:41 2024 +0530

    Merge pull request #26 from GoogleCloudPlatform/main

    tests: Adding Forward Migration Tests (GoogleCloudPlatform#2001)

commit 7512825
Merge: 71a6477 8479c8a
Author: Taher Lakdawala <[email protected]>
Date:   Tue Dec 17 17:59:51 2024 +0530

    Merge pull request #24 from GoogleCloudPlatform/main

    Sync main branch

commit 71a6477
Merge: d314c70 cd28d01
Author: Taher Lakdawala <[email protected]>
Date:   Mon Dec 16 18:33:54 2024 +0530

    Merge pull request #20 from GoogleCloudPlatform/main

    Sync main branch

commit d314c70
Merge: 15b621d 91b5be3
Author: Taher Lakdawala <[email protected]>
Date:   Mon Dec 9 12:02:07 2024 +0530

    Merge pull request #9 from GoogleCloudPlatform/main

    Sync master

commit 15b621d
Merge: 1bef5ff b68fe21
Author: taherkl <[email protected]>
Date:   Wed Nov 27 20:19:54 2024 +0530

    Merge remote-tracking branch 'upstream/main'
  • Loading branch information
@pawankashyapollion
pawankashyapollion committed Jan 20, 2025
1 parent 0c9d7a8 commit f83e3f7
Show file tree
Hide file tree
Showing 10 changed files with 298 additions and 298 deletions.
20 changes: 10 additions & 10 deletions .github/codecov.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ component_management:
- component_id: spanner-templates
name: spanner-templates
paths:
- "v1/src/main/java/com/google/cloud/teleport/spanner/**"
- "v1/src/main/java/com/google/cloud/teleport/templates/SpannerToText.java"
- "v1/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java"
- "v2/datastream-to-spanner/**"
- "v2/spanner-common/**"
- "v2/spanner-change-streams-to-sharded-file-sink/**"
- "v2/gcs-to-sourcedb/**"
- "v2/spanner-migrations-sdk/**"
- "v2/spanner-custom-shard/**"
- "v2/sourcedb-to-spanner/**"
# - "v1/src/main/java/com/google/cloud/teleport/spanner/**"
# - "v1/src/main/java/com/google/cloud/teleport/templates/SpannerToText.java"
# - "v1/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java"
# - "v2/datastream-to-spanner/**"
# - "v2/spanner-common/**"
# - "v2/spanner-change-streams-to-sharded-file-sink/**"
# - "v2/gcs-to-sourcedb/**"
# - "v2/spanner-migrations-sdk/**"
# - "v2/spanner-custom-shard/**"
# - "v2/sourcedb-to-spanner/**"
- "v2/spanner-to-sourcedb/**"
statuses:
- type: project
Expand Down
57 changes: 24 additions & 33 deletions .github/workflows/java-pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# 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.

# Checks that are intended to run on PRs containing Java code.

name: Java PR
Expand All @@ -21,23 +20,12 @@ on:
branches:
- 'main'
paths:
- '**.java'
- '**.xml'
# Include python files and Dockerfiles used for YAML and xlang templates.
- '**.py'
- 'plugins/core-plugin/src/main/resources/**'
# Include relevant GitHub Action files for running these checks.
# This will make it easier to verify action changes don't break anything.
- 'v2/spanner-to-sourcedb/**.java'
- 'v2/spanner-to-sourcedb/**.xml'
- 'v2/spanner-to-sourcedb/**.py'
- '.github/actions/setup-env/*'
- '.github/workflows/java-pr.yml'
# Exclude spanner paths from global run (covered in https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/.github/workflows/spanner-pr.yml)
- '!v2/datastream-to-spanner/**'
- '!v2/spanner-common/**'
- '!v2/spanner-change-streams-to-sharded-file-sink/**'
- '!v2/gcs-to-sourcedb/**'
- '!v2/spanner-migrations-sdk/**'
- '!v2/spanner-custom-shard/**'
- '!v2/sourcedb-to-spanner/**'
- '!v1/**'
schedule:
- cron: "0 */12 * * *"
workflow_dispatch:
Expand All @@ -47,7 +35,7 @@ concurrency:
cancel-in-progress: true

env:
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=error
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=error

permissions: read-all

Expand Down Expand Up @@ -103,6 +91,7 @@ jobs:
uses: ./.github/actions/setup-env
- name: Run Unit Tests
run: ./cicd/run-unit-tests
# run: mvn -B clean verify -f pom.xml -e -Dcheckstyle.skip -Djib.skip -DskipShade -Dspotless.check.skip -DskipIntegrationTests -fae -T8 --settings=.mvn/settings.xml -pl v2/spanner-to-sourcedb
- name: Upload Unit Tests Report
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: always() # always run even if the previous step fails
Expand All @@ -114,7 +103,7 @@ jobs:
uses: codecov/[email protected]
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: GoogleCloudPlatform/DataflowTemplates
slug: ollionorg/DataflowTemplates-fork
files: 'target/site/jacoco-aggregate/jacoco.xml'
# Temp fix for https://github.com/codecov/codecov-action/issues/1487
version: v0.6.0
Expand All @@ -134,9 +123,9 @@ jobs:
id: setup-env
uses: ./.github/actions/setup-env
- name: Run Integration Smoke Tests
run: |
run: |
./cicd/run-it-smoke-tests \
--modules-to-build="DEFAULT" \
--modules-to-build="v2/spanner-to-sourcedb" \
--it-region="us-central1" \
--it-project="cloud-teleport-testing" \
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
Expand Down Expand Up @@ -164,13 +153,13 @@ jobs:
id: setup-env
uses: ./.github/actions/setup-env
- name: Run Integration Tests
run: |
run: |
./cicd/run-it-tests \
--modules-to-build="DEFAULT" \
--it-region="us-central1" \
--it-project="cloud-teleport-testing" \
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
--it-private-connectivity="datastream-private-connect-us-central1"
--modules-to-build="v2/spanner-to-sourcedb" \
--it-region="asia-south1" \
--it-project="daring-fiber-439305-v4" \
--it-artifact-bucket="ollion-teleport-testing" \
--it-private-connectivity="datastream-private-connect-asia-south1"
- name: Upload Integration Tests Report
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: always() # always run even if the previous step fails
Expand All @@ -182,12 +171,13 @@ jobs:
uses: ./.github/actions/cleanup-java-env
if: always()
java_load_tests_templates:
if: contains(github.event.pull_request.labels.*.name, 'run-load-tests')
# if: contains(github.event.pull_request.labels.*.name, 'run-load-tests')
name: Dataflow Templates Load Tests
needs: [spotless_check, checkstyle_check, java_build, java_unit_tests, java_integration_tests_templates]
needs: [spotless_check, checkstyle_check, java_integration_tests_templates]
# needs: [spotless_check, checkstyle_check]
timeout-minutes: 600
# Run on any runner that matches all the specified runs-on values.
runs-on: [self-hosted, perf]
runs-on: [self-hosted]
steps:
- name: Checkout Code
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
Expand All @@ -197,10 +187,11 @@ jobs:
- name: Run Load Tests
run: |
./cicd/run-load-tests \
--it-region="us-central1" \
--it-project="cloud-teleport-testing" \
--it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
--it-private-connectivity="datastream-private-connect-us-central1"
--it-region="asia-south1" \
--it-project="daring-fiber-439305-v4" \
--it-artifact-bucket="ollion-teleport-testing" \
--it-private-connectivity="datastream-private-connect-asia-south1" \
--modules-to-build="v2/spanner-to-sourcedb"
- name: Cleanup Java Environment
uses: ./.github/actions/cleanup-java-env
if: always()
170 changes: 85 additions & 85 deletions cicd/cmd/run-it-tests/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
/*
* Copyright (C) 2022 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
*
* http://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.
*/

package main

import (
"flag"
"log"

"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/flags"
"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/workflows"
)

func main() {
flags.RegisterCommonFlags()
flags.RegisterItFlags()
flag.Parse()

// Run mvn install before running integration tests
mvnFlags := workflows.NewMavenFlags()
err := workflows.MvnCleanInstall().Run(
mvnFlags.IncludeDependencies(),
mvnFlags.IncludeDependents(),
mvnFlags.SkipDependencyAnalysis(),
mvnFlags.SkipCheckstyle(),
mvnFlags.SkipJib(),
mvnFlags.SkipTests(),
mvnFlags.SkipJacoco(),
mvnFlags.SkipShade(),
mvnFlags.ThreadCount(8),
mvnFlags.InternalMaven())
if err != nil {
log.Fatalf("%v\n", err)
}

// Run integration tests
mvnFlags = workflows.NewMavenFlags()
err = workflows.MvnVerify().Run(
mvnFlags.IncludeDependencies(),
mvnFlags.IncludeDependents(),
mvnFlags.SkipDependencyAnalysis(),
mvnFlags.SkipCheckstyle(),
mvnFlags.SkipJib(),
mvnFlags.SkipShade(),
mvnFlags.RunIntegrationTests(flags.UnifiedWorkerHarnessContainerImage() != ""),
mvnFlags.ThreadCount(4),
mvnFlags.IntegrationTestParallelism(3),
mvnFlags.StaticBigtableInstance("teleport"),
mvnFlags.StaticSpannerInstance("teleport"),
mvnFlags.InternalMaven(),
flags.Region(),
flags.Project(),
flags.ArtifactBucket(),
flags.StageBucket(),
flags.HostIp(),
flags.PrivateConnectivity(),
flags.SpannerHost(),
flags.FailureMode(),
flags.RetryFailures(),
flags.StaticOracleHost(),
flags.StaticOracleSysPassword(),
flags.CloudProxyHost(),
flags.CloudProxyMySqlPort(),
flags.CloudProxyPostgresPort(),
flags.CloudProxyPassword(),
flags.UnifiedWorkerHarnessContainerImage(),
flags.CloudProxyPassword())
if err != nil {
log.Fatalf("%v\n", err)
}
log.Println("Build Successful!")
}
/*
* Copyright (C) 2022 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
*
* http://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.
*/

package main

import (
"flag"
"log"

"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/flags"
"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/workflows"
)

func main() {
flags.RegisterCommonFlags()
flags.RegisterItFlags()
flag.Parse()

// Run mvn install before running integration tests
mvnFlags := workflows.NewMavenFlags()
err := workflows.MvnCleanInstall().Run(
mvnFlags.IncludeDependencies(),
mvnFlags.IncludeDependents(),
mvnFlags.SkipDependencyAnalysis(),
mvnFlags.SkipCheckstyle(),
mvnFlags.SkipJib(),
mvnFlags.SkipTests(),
mvnFlags.SkipJacoco(),
mvnFlags.SkipShade(),
mvnFlags.ThreadCount(8),
mvnFlags.InternalMaven())
if err != nil {
log.Fatalf("%v\n", err)
}

// Run integration tests
mvnFlags = workflows.NewMavenFlags()
err = workflows.MvnVerify().Run(
mvnFlags.IncludeDependencies(),
mvnFlags.IncludeDependents(),
mvnFlags.SkipDependencyAnalysis(),
mvnFlags.SkipCheckstyle(),
mvnFlags.SkipJib(),
mvnFlags.SkipShade(),
mvnFlags.RunIntegrationTests(flags.UnifiedWorkerHarnessContainerImage() != ""),
mvnFlags.ThreadCount(4),
mvnFlags.IntegrationTestParallelism(3),
// mvnFlags.StaticBigtableInstance("teleport"),
mvnFlags.StaticSpannerInstance("spanner-demo"),
mvnFlags.InternalMaven(),
flags.Region(),
flags.Project(),
flags.ArtifactBucket(),
flags.StageBucket(),
flags.HostIp(),
flags.PrivateConnectivity(),
flags.SpannerHost(),
flags.FailureMode(),
flags.RetryFailures(),
// flags.StaticOracleHost(),
// flags.StaticOracleSysPassword(),
// flags.CloudProxyHost(),
// flags.CloudProxyMySqlPort(),
// flags.CloudProxyPostgresPort(),
// flags.CloudProxyPassword(),
flags.UnifiedWorkerHarnessContainerImage())
// flags.CloudProxyPassword())
if err != nil {
log.Fatalf("%v\n", err)
}
log.Println("Build Successful!")
}
2 changes: 1 addition & 1 deletion cicd/cmd/run-unit-tests/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ func main() {
log.Fatalf("%v\n", err)
}
log.Println("Verification Successful!")
}
}
Loading

0 comments on commit f83e3f7

Please sign in to comment.