Merge pull request #1330 from fedinskiy/fix/remove-outdated

Rename outdated properties
quarkus-qe · Aug 1, 2023 · 71d380b · 71d380b
2 parents baffa67 + 2f451bf
commit 71d380b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+
 # Quarkus Test Suite
 
 Test Suite for Quarkus integration scenarios. Among the standard Quarkus test features, scenarios hardly rely on [Quarkus-test-framework](https://github.com/quarkus-qe/quarkus-test-framework) features
@@ -936,8 +937,8 @@ This test could be extended with some metric gathering.
 ### `external-applications`
 
 External applications need a base image which is used by OpenShift to build the app on. So, one base image needs to be supplied forJVM and Native:
-- For JVM: `ts.global.s2i.quarkus.jvm.builder.image`
-- For Native: `ts.global.s2i.quarkus.native.builder.image`
+- For JVM: `quarkus.s2i.base-jvm-image`
+- For Native: `quarkus.s2i.base-native-image`
 
 These properties have default values set in the pom.xml file.
 

diff --git a/pom.xml b/pom.xml
@@ -41,8 +41,8 @@
         <!-- Faster build when using -DskipTests -->
         <quarkus.build.skip>${skipTests}</quarkus.build.skip>
         <!-- S2i configuration -->
-        <ts.global.s2i.quarkus.jvm.builder.image>registry.access.redhat.com/ubi8/openjdk-11:latest</ts.global.s2i.quarkus.jvm.builder.image>
-        <ts.global.s2i.quarkus.native.builder.image>quay.io/quarkus/ubi-quarkus-graalvmce-s2i:22.3-java17</ts.global.s2i.quarkus.native.builder.image>
+        <quarkus.s2i.base-jvm-image>registry.access.redhat.com/ubi8/openjdk-17:latest</quarkus.s2i.base-jvm-image>
+        <quarkus.s2i.base-native-image>quay.io/quarkus/ubi-quarkus-native-binary-s2i:2.0</quarkus.s2i.base-native-image>
         <!-- Default values for format -->
         <src.format.goal>format</src.format.goal>
         <src.sort.goal>sort</src.sort.goal>
@@ -232,8 +232,8 @@
                             <systemPropertyVariables>
                                 <profile.id>${profile.id}</profile.id>
                                 <!-- S2i configuration for OpenShift -->
-                                <ts.global.s2i.quarkus.jvm.builder.image>${ts.global.s2i.quarkus.jvm.builder.image}</ts.global.s2i.quarkus.jvm.builder.image>
-                                <ts.global.s2i.quarkus.native.builder.image>${ts.global.s2i.quarkus.native.builder.image}</ts.global.s2i.quarkus.native.builder.image>
+                                <quarkus.s2i.base-jvm-image>${quarkus.s2i.base-jvm-image}</quarkus.s2i.base-jvm-image>
+                                <quarkus.s2i.base-native-image>${quarkus.s2i.base-native-image}</quarkus.s2i.base-native-image>
                                 <!-- Services used in test suite -->
                                 <postgresql.latest.image>${postgresql.latest.image}</postgresql.latest.image>
                                 <elastic.71.image>docker.io/library/elasticsearch:7.17.10</elastic.71.image>