Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

actions change #49

Open
wants to merge 59 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
7076172
actions change
Jan 7, 2025
d87ccfc
modify maven registry
nasir19noor Jan 7, 2025
394c477
modify maven surefire plugin
nasir19noor Jan 8, 2025
284603c
modify run-unit-test
nasir19noor Jan 8, 2025
8d6e777
modify run-unit-test line 43
nasir19noor Jan 8, 2025
62965d2
modify run-unit-test line 45
nasir19noor Jan 8, 2025
0708902
revert back run-unit-test
nasir19noor Jan 8, 2025
f5a6599
revert back
nasir19noor Jan 8, 2025
b85f4ce
increase memory for run unit test stage
nasir19noor Jan 8, 2025
db75fa5
revert back
nasir19noor Jan 8, 2025
9a0c4a2
modify cicd/cmd/run-unit-test/main.go for testing
nasir19noor Jan 8, 2025
6ed8195
revert back main.go
nasir19noor Jan 8, 2025
6232d27
surefire plugin testing
nasir19noor Jan 8, 2025
0ff10d6
surefire plugin testing
nasir19noor Jan 8, 2025
b0d7724
revert back
nasir19noor Jan 8, 2025
bf2ec2b
update workflow to work only for spanner-to-sourcedb
nasir19noor Jan 9, 2025
d38a591
remove java-pr copy.yml
nasir19noor Jan 9, 2025
38747bf
modify surefire version
nasir19noor Jan 9, 2025
954d5ec
remove execution block v1/pom.xml
nasir19noor Jan 9, 2025
47ae923
revert back surefire version
nasir19noor Jan 10, 2025
20371fb
modify integration smoke test steps to use own bucket, project
nasir19noor Jan 10, 2025
0e35d9e
revert back UT and IT
nasir19noor Jan 10, 2025
f8a7f5b
exclude v1
nasir19noor Jan 10, 2025
552a171
remove modules keep spanner-to-sourcedb
nasir19noor Jan 14, 2025
6cedb8a
remove modules googlecloud-to-googleclou
nasir19noor Jan 14, 2025
69463e6
update integration test work only spanner-to-sourcedb
nasir19noor Jan 14, 2025
4bb4028
add v2/spanner-to-sourcedb/.mvn
nasir19noor Jan 14, 2025
220d8fb
update Run IT Smoke tests ./cicd/run-it-smoke-tests \
nasir19noor Jan 14, 2025
f786250
handle only spanner-to-sourcedb project
nasir19noor Jan 14, 2025
603d28f
spanner-to-sourcedb project
nasir19noor Jan 14, 2025
63449d9
v2/spanner-to-sourcedb project
nasir19noor Jan 14, 2025
8ec0f2a
v2/spanner-to-sourcedb project for IT
nasir19noor Jan 14, 2025
09dd1e1
modify project, bucket in IT
nasir19noor Jan 14, 2025
b1543cf
remove backup file
nasir19noor Jan 14, 2025
54907b0
remove backup file
nasir19noor Jan 14, 2025
362443f
test codecov
nasir19noor Jan 14, 2025
bea9422
remove comment
nasir19noor Jan 14, 2025
1db2c82
change spanner instance id
nasir19noor Jan 14, 2025
ca1ea25
change spanner instance id spanner-demo
nasir19noor Jan 14, 2025
c5b8103
exclude unnecessary parameter, only spanner is requird
nasir19noor Jan 15, 2025
c6278b5
include mysql cred
nasir19noor Jan 15, 2025
49942e7
temp - exclude unit test dependency
nasir19noor Jan 15, 2025
f10b6ce
add spanner-demo instance id
nasir19noor Jan 15, 2025
b019935
revert back it-flags.go
nasir19noor Jan 15, 2025
783f00f
modify it test main.go
nasir19noor Jan 15, 2025
bf1c3d7
modify the format
nasir19noor Jan 15, 2025
1e0bf31
exclude build dependency
nasir19noor Jan 15, 2025
c19e1a0
exclude tags perf on load test
nasir19noor Jan 15, 2025
409200b
exclude build and unit test
nasir19noor Jan 15, 2025
b6f5761
modify IT command
nasir19noor Jan 15, 2025
dbfec41
modify IT command 2
nasir19noor Jan 15, 2025
a0b6ded
modify IT command 3
nasir19noor Jan 15, 2025
c6334db
modify IT command 4
nasir19noor Jan 15, 2025
40d23bf
modify IT to initial
nasir19noor Jan 15, 2025
bbb61cd
modify IT to initial
nasir19noor Jan 15, 2025
70481f2
modify IT to initial
nasir19noor Jan 15, 2025
93e3d21
modify host IP
nasir19noor Jan 15, 2025
3c8b375
modify run it test main.go
nasir19noor Jan 15, 2025
a1dcae7
use IT command from Google
nasir19noor Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/codecov.yml
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
193 changes: 91 additions & 102 deletions .github/workflows/java-pr.yml
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 Down Expand Up @@ -76,84 +64,84 @@ jobs:
uses: ./.github/actions/setup-env
- name: Run Checkstyle
run: ./cicd/run-checkstyle
java_build:
name: Build
timeout-minutes: 60
runs-on: [self-hosted, it]
steps:
- name: Checkout Code
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
- name: Setup Environment
id: setup-env
uses: ./.github/actions/setup-env
- name: Run Build
run: ./cicd/run-build
- name: Cleanup Java Environment
uses: ./.github/actions/cleanup-java-env
java_unit_tests:
name: Unit Tests
needs: [java_build]
timeout-minutes: 60
runs-on: [self-hosted, it]
steps:
- name: Checkout Code
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
- name: Setup Environment
id: setup-env
uses: ./.github/actions/setup-env
- name: Run Unit Tests
run: ./cicd/run-unit-tests
- name: Upload Unit Tests Report
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: always() # always run even if the previous step fails
with:
name: surefire-test-results
path: '**/surefire-reports/TEST-*.xml'
retention-days: 1
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4.0.1
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: GoogleCloudPlatform/DataflowTemplates
files: 'target/site/jacoco-aggregate/jacoco.xml'
# Temp fix for https://github.com/codecov/codecov-action/issues/1487
version: v0.6.0
- name: Cleanup Java Environment
uses: ./.github/actions/cleanup-java-env
if: always()
java_integration_smoke_tests_templates:
name: Dataflow Templates Integration Smoke Tests
needs: [spotless_check, checkstyle_check, java_build, java_unit_tests]
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@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.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="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"
- name: Upload Smoke Tests Report
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: always() # always run even if the previous step fails
with:
name: surefire-test-results
path: '**/surefire-reports/TEST-*.xml'
retention-days: 1
- name: Cleanup Java Environment
uses: ./.github/actions/cleanup-java-env
if: always()
# java_build:
# name: Build
# timeout-minutes: 60
# runs-on: [self-hosted, it]
# steps:
# - name: Checkout Code
# uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
# - name: Setup Environment
# id: setup-env
# uses: ./.github/actions/setup-env
# - name: Run Build
# run: ./cicd/run-build
# - name: Cleanup Java Environment
# uses: ./.github/actions/cleanup-java-env
# java_unit_tests:
# name: Unit Tests
# # needs: [java_build]
# timeout-minutes: 60
# runs-on: [self-hosted, it]
# steps:
# - name: Checkout Code
# uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
# - name: Setup Environment
# id: setup-env
# uses: ./.github/actions/setup-env
# - name: Run Unit Tests
# run: ./cicd/run-unit-tests
# - name: Upload Unit Tests Report
# uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
# if: always() # always run even if the previous step fails
# with:
# name: surefire-test-results
# path: '**/surefire-reports/TEST-*.xml'
# retention-days: 1
# - name: Upload coverage reports to Codecov
# uses: codecov/codecov-action@v4.0.1
# with:
# token: ${{ secrets.CODECOV_TOKEN }}
# 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
# - name: Cleanup Java Environment
# uses: ./.github/actions/cleanup-java-env
# if: always()
# java_integration_smoke_tests_templates:
# name: Dataflow Templates Integration Smoke Tests
# needs: [spotless_check, checkstyle_check]
# 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@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.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="v2/spanner-to-sourcedb" \
# --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"
# - name: Upload Smoke Tests Report
# uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
# if: always() # always run even if the previous step fails
# with:
# name: surefire-test-results
# path: '**/surefire-reports/TEST-*.xml'
# retention-days: 1
# - name: Cleanup Java Environment
# uses: ./.github/actions/cleanup-java-env
# if: always()
java_integration_tests_templates:
name: Dataflow Templates Integration Tests
needs: [java_integration_smoke_tests_templates]
# needs: [java_integration_smoke_tests_templates]
timeout-minutes: 240
# Run on any runner that matches all the specified runs-on values.
runs-on: [self-hosted, it]
Expand All @@ -164,13 +152,14 @@ jobs:
id: setup-env
uses: ./.github/actions/setup-env
- name: Run Integration Tests
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"
run: mvn clean verify -PtemplatesIntegrationTests -pl v2/spanner-to-sourcedb -am -Dtest=SpannerToSourceDbCustomTransformationIT -Dcheckstyle.skip -Dspotless.check.skip=true -DartifactBucket="smt-df-templates-test" -Dproject="span-cloud-migrations-testing" -Dregion=us-central1 -DspannerInstanceId="test-instance"
# |
# ./cicd/run-it-tests \
# --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,12 @@ 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]
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 Down
Loading
Loading