Skip to content

Commit 0ade915

Browse files
authored
chore: add native-image-shared-config as parent (#1908)
* chore: add native-image-shared-config as the parent and managed image tag with renovate bot
1 parent 61fb53c commit 0ade915

File tree

6 files changed

+27
-45
lines changed

6 files changed

+27
-45
lines changed

.kokoro/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ graalvm17)
8181
;;
8282
graalvmA)
8383
# Run Unit and Integration Tests with Native Image
84-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
84+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
8585
RETURN_CODE=$?
8686
;;
8787
graalvmB)
8888
# Run Unit and Integration Tests with Native Image
89-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
89+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
9090
RETURN_CODE=$?
9191
;;
9292
samples)

.kokoro/presubmit/graalvm-native-a.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.7.1"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-b.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.7.1"
77
}
88

99
env_vars: {

owlbot.py

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"license-checks.xml",
3030
".github/workflows/samples.yaml",
3131
".kokoro/build.sh",
32+
"renovate.json",
3233
".github/workflows/ci.yaml"
3334
]
3435
)

pom.xml

+11-41
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@
8989
</pluginRepository>
9090
</pluginRepositories>
9191

92+
<parent>
93+
<groupId>com.google.cloud</groupId>
94+
<artifactId>native-image-shared-config</artifactId>
95+
<version>1.7.1</version>
96+
</parent>
97+
9298
<!--
9399
If you change the version of a dependency, make sure to update the javadoc
94100
links if required, and any javadoc links of your dependency in the oauth and
@@ -587,59 +593,23 @@
587593

588594
<profiles>
589595
<profile>
590-
<!-- This profile is used to enable GraalVM native image testing -->
591-
<id>native</id>
592-
<dependencies>
593-
<dependency>
594-
<groupId>org.junit.vintage</groupId>
595-
<artifactId>junit-vintage-engine</artifactId>
596-
<version>5.10.0</version>
597-
<scope>test</scope>
598-
</dependency>
599-
<dependency>
600-
<groupId>org.graalvm.buildtools</groupId>
601-
<artifactId>junit-platform-native</artifactId>
602-
<version>0.9.23</version>
603-
<scope>test</scope>
604-
</dependency>
605-
</dependencies>
596+
<id>native-tests</id>
606597
<build>
607598
<plugins>
608599
<plugin>
609600
<groupId>org.apache.maven.plugins</groupId>
610601
<artifactId>maven-surefire-plugin</artifactId>
611-
<!-- Must use older version of surefire plugin for native-image testing. -->
612-
<version>2.22.2</version>
602+
<version>${surefire.version}</version>
613603
<configuration>
614604
<!-- Include all tests during native image testing. -->
615-
<excludes combine.self="override"/>
616-
</configuration>
617-
</plugin>
618-
<plugin>
619-
<groupId>org.graalvm.buildtools</groupId>
620-
<artifactId>native-maven-plugin</artifactId>
621-
<version>0.9.23</version>
622-
<extensions>true</extensions>
623-
<executions>
624-
<execution>
625-
<id>test-native</id>
626-
<goals>
627-
<goal>test</goal>
628-
</goals>
629-
<phase>test</phase>
630-
</execution>
631-
</executions>
632-
<configuration>
633-
<buildArgs>
634-
<buildArg>--no-fallback</buildArg>
635-
<buildArg>--no-server</buildArg>
636-
</buildArgs>
605+
<includes combine.self="override">
606+
<include>**/*Test</include>
607+
</includes>
637608
</configuration>
638609
</plugin>
639610
</plugins>
640611
</build>
641612
</profile>
642-
643613
<profile>
644614
<id>Windows</id>
645615
<activation>

renovate.json

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
":autodetectPinVersions"
1212
],
1313
"ignorePaths": [".kokoro/requirements.txt"],
14+
"customManagers": [
15+
{
16+
"customType": "regex",
17+
"fileMatch": [
18+
"^.kokoro/presubmit/graalvm-native.*.cfg$"
19+
],
20+
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
21+
"depNameTemplate": "com.google.cloud:native-image-shared-config",
22+
"datasourceTemplate": "maven"
23+
}
24+
],
1425
"packageRules": [
1526
{
1627
"packagePatterns": [

0 commit comments

Comments
 (0)