Skip to content

ci: change presubmit jobs to run against cloud-devel #3811

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 9, 2025
Merged

ci: change presubmit jobs to run against cloud-devel #3811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions .kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ integration)
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dmaven.main.skip=true \
-Dspanner.gce.config.project_id=gcloud-devel \
-Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests \
-Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \
-Dspanner.gce.config.project_id=span-cloud-testing \
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-tests \
-fae \
verify
RETURN_CODE=$?
Expand All @@ -113,6 +114,7 @@ integration-directpath-enabled)
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dmaven.main.skip=true \
-Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-java-client-directpath \
-Dspanner.gce.config.project_id=span-cloud-testing \
-fae \
Expand All @@ -128,8 +130,9 @@ integration-multiplexed-sessions-enabled)
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dmaven.main.skip=true \
-Dspanner.gce.config.project_id=gcloud-devel \
-Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-multiplexed-sessions \
-Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \
-Dspanner.gce.config.project_id=span-cloud-testing \
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-tests-multiplexed-sessions \
-fae \
verify
RETURN_CODE=$?
Expand Down
11 changes: 0 additions & 11 deletions .kokoro/presubmit/integration-directpath-enabled.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,6 @@ env_vars: {
value: "integration-directpath-enabled"
}

# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-client-testing"
Expand Down
15 changes: 2 additions & 13 deletions .kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,14 @@ env_vars: {
value: "integration-multiplexed-sessions-enabled"
}

# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-it-service-account"
value: "secret_manager/java-client-testing"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
value: "java-client-testing"
}

env_vars: {
Expand Down
16 changes: 2 additions & 14 deletions .kokoro/presubmit/integration.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,12 @@ env_vars: {
value: "integration"
}

# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-it-service-account"
value: "secret_manager/java-client-testing"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
value: "java-client-testing"
}

Loading