diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5e4506723..23c04b843 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -15,8 +15,9 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' + - 'Kokoro - Test: Java GraalVM Native Image A' + - 'Kokoro - Test: Java GraalVM Native Image B' + - 'Kokoro - Test: Java GraalVM Native Image C' - javadoc - unmanaged_dependency_check - pattern: java7 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 73ab82e68..c53209e53 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -64,6 +64,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.29.4 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -77,11 +78,6 @@ graalvm) mvn test -Pnative -Penable-integration-tests RETURN_CODE=$? ;; -graalvm17) - # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests - RETURN_CODE=$? - ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native-a.cfg similarity index 100% rename from .kokoro/presubmit/graalvm-native.cfg rename to .kokoro/presubmit/graalvm-native-a.cfg diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-b.cfg similarity index 96% rename from .kokoro/presubmit/graalvm-native-17.cfg rename to .kokoro/presubmit/graalvm-native-b.cfg index eb516de93..df2cd6dff 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -8,7 +8,7 @@ env_vars: { env_vars: { key: "JOB_TYPE" - value: "graalvm17" + value: "graalvm" } # TODO: remove this after we've migrated all tests and scripts diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg new file mode 100644 index 000000000..d5625a6a4 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# 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" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/google-cloud-nio-bom/pom.xml b/google-cloud-nio-bom/pom.xml index b3c2e1569..89dddbb82 100644 --- a/google-cloud-nio-bom/pom.xml +++ b/google-cloud-nio-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-nio-bom - 0.127.34 + 0.127.35-SNAPSHOT pom com.google.cloud @@ -54,7 +54,7 @@ com.google.cloud google-cloud-nio - 0.127.34 + 0.127.35-SNAPSHOT diff --git a/google-cloud-nio-examples/pom.xml b/google-cloud-nio-examples/pom.xml index b7875c4b1..f16826d9e 100644 --- a/google-cloud-nio-examples/pom.xml +++ b/google-cloud-nio-examples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio-examples - 0.127.34 + 0.127.35-SNAPSHOT jar Google Cloud NIO Examples https://github.com/googleapis/java-storage-nio @@ -13,7 +13,7 @@ com.google.cloud google-cloud-nio-parent - 0.127.34 + 0.127.35-SNAPSHOT diff --git a/google-cloud-nio-retrofit/pom.xml b/google-cloud-nio-retrofit/pom.xml index d2d3f2d8b..e134251af 100644 --- a/google-cloud-nio-retrofit/pom.xml +++ b/google-cloud-nio-retrofit/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio-retrofit - 0.127.34 + 0.127.35-SNAPSHOT jar Google Cloud NIO Retrofit Example https://github.com/googleapis/java-storage-nio @@ -12,7 +12,7 @@ com.google.cloud google-cloud-nio-parent - 0.127.34 + 0.127.35-SNAPSHOT google-cloud-nio-retrofit diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml index c72269035..9f7112d58 100644 --- a/google-cloud-nio/pom.xml +++ b/google-cloud-nio/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio - 0.127.34 + 0.127.35-SNAPSHOT jar Google Cloud NIO https://github.com/googleapis/java-storage-nio @@ -12,7 +12,7 @@ com.google.cloud google-cloud-nio-parent - 0.127.34 + 0.127.35-SNAPSHOT google-cloud-nio diff --git a/pom.xml b/pom.xml index 156c9cf31..2a97b8ea9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-nio-parent pom - 0.127.34 + 0.127.35-SNAPSHOT Storage Parent https://github.com/googleapis/java-storage-nio diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 7b02e9dfb..233e8eb6d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-nio - 0.127.32 + 0.127.34 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e84289a35..e16ebe38c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-nio - 0.127.34 + 0.127.35-SNAPSHOT diff --git a/versions.txt b/versions.txt index a3698ef26..3cf58ac92 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-nio:0.127.34:0.127.34 \ No newline at end of file +google-cloud-nio:0.127.34:0.127.35-SNAPSHOT \ No newline at end of file