Skip to content

Commit

Permalink
chore: add native-image-shared-config as parent (#1908)
Browse files Browse the repository at this point in the history
* chore: add native-image-shared-config as the parent and managed image tag with renovate bot
  • Loading branch information
mpeddada1 authored Dec 12, 2023
1 parent 61fb53c commit 0ade915
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ graalvm17)
;;
graalvmA)
# Run Unit and Integration Tests with Native Image
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
RETURN_CODE=$?
;;
graalvmB)
# Run Unit and Integration Tests with Native Image
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
RETURN_CODE=$?
;;
samples)
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-a.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.7.1"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-b.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.7.1"
}

env_vars: {
Expand Down
1 change: 1 addition & 0 deletions owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"license-checks.xml",
".github/workflows/samples.yaml",
".kokoro/build.sh",
"renovate.json",
".github/workflows/ci.yaml"
]
)
52 changes: 11 additions & 41 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@
</pluginRepository>
</pluginRepositories>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>native-image-shared-config</artifactId>
<version>1.7.1</version>
</parent>

<!--
If you change the version of a dependency, make sure to update the javadoc
links if required, and any javadoc links of your dependency in the oauth and
Expand Down Expand Up @@ -587,59 +593,23 @@

<profiles>
<profile>
<!-- This profile is used to enable GraalVM native image testing -->
<id>native</id>
<dependencies>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>junit-platform-native</artifactId>
<version>0.9.23</version>
<scope>test</scope>
</dependency>
</dependencies>
<id>native-tests</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Must use older version of surefire plugin for native-image testing. -->
<version>2.22.2</version>
<version>${surefire.version}</version>
<configuration>
<!-- Include all tests during native image testing. -->
<excludes combine.self="override"/>
</configuration>
</plugin>
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>0.9.23</version>
<extensions>true</extensions>
<executions>
<execution>
<id>test-native</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
<configuration>
<buildArgs>
<buildArg>--no-fallback</buildArg>
<buildArg>--no-server</buildArg>
</buildArgs>
<includes combine.self="override">
<include>**/*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>Windows</id>
<activation>
Expand Down
11 changes: 11 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
":autodetectPinVersions"
],
"ignorePaths": [".kokoro/requirements.txt"],
"customManagers": [
{
"customType": "regex",
"fileMatch": [
"^.kokoro/presubmit/graalvm-native.*.cfg$"
],
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
"depNameTemplate": "com.google.cloud:native-image-shared-config",
"datasourceTemplate": "maven"
}
],
"packageRules": [
{
"packagePatterns": [
Expand Down

0 comments on commit 0ade915

Please sign in to comment.