Improve s2i properties to use the standard ones #309
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
run tests |
pjgg
suggested changes
Oct 15, 2021
| private void withBaseImageProperties(List<String> args) { | ||
| // Resolve s2i property | ||
| boolean isNativeTest = isNativeTest(); | ||
| PropertyLookup s2iImageProperty = isNativeTest ? QUARKUS_NATIVE_S2I : QUARKUS_JVM_S2I; |
There was a problem hiding this comment.
Could you move on this PropertyLookup s2iImageProperty = ... to a private String getS2iImage() as you did in
BuildOpenShiftQuarkusApplicationManagedResource
There was a problem hiding this comment.
In BuildOpenShiftQuarkusApplicationManagedResource, we only need the image value, but here we need the image value + the property key, so we can't do this.
pjgg
approved these changes
Oct 15, 2021
Sgitario
force-pushed
the
improve_s2i_properties
branch
from
7d4c951 to
4b7c376
Compare
|
run tests |
Sgitario
force-pushed
the
improve_s2i_properties
branch
from
4b7c376 to
4d6b282
Compare
|
run tests |
The properties `ts.global.s2i.quarkus.jvm.builder.image` and `ts.global.s2i.quarkus.native.builder.image` properties have been deleted in favour of the Quarkus official ones: - quarkus.s2i.base-jvm-image - quarkus.s2i.base-native-image Moreover, when using the OpenShift extension, if the user does not supply the `quarkus.openshift.base-xxx-image`, the framework will use the ones from `quarkus.s2i.base-xxx-image`.
Sgitario
force-pushed
the
improve_s2i_properties
branch
from
4d6b282 to
e04adbd
Compare
|
run tests |
10 tasks
fedinskiy
added a commit
to fedinskiy/quarkus-test-suite
that referenced
this pull request
Jul 26, 2023
9 tasks
fedinskiy
added a commit
to fedinskiy/quarkus-test-suite
that referenced
this pull request
Jul 26, 2023
fedinskiy
added a commit
to fedinskiy/quarkus-test-suite
that referenced
this pull request
Jul 26, 2023
fedinskiy
added a commit
to fedinskiy/quarkus-test-suite
that referenced
this pull request
Jul 31, 2023
and use recommended image[2] as a base for s2i [1] quarkus-qe/quarkus-test-framework#309 [2] https://github.com/quarkusio/quarkus-images#quarkus-images-1: ``` ubi-quarkus-native-binary-s2i - S2I builder image for OpenShift taking a pre-built native executable as input ```
fedinskiy
added a commit
to fedinskiy/quarkus-test-suite
that referenced
this pull request
Aug 1, 2023
- Rename properties - use recommended image[2] as a base for native s2i - use the same base jvm image as in framework[3] [1] quarkus-qe/quarkus-test-framework#309 [2] https://github.com/quarkusio/quarkus-images#quarkus-images-1: ``` ubi-quarkus-native-binary-s2i - S2I builder image for OpenShift taking a pre-built native executable as input ``` [3] https://github.com/quarkus-qe/quarkus-test-framework/blob/main/quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/model/QuarkusProperties.java#L26
fedinskiy
added a commit
to fedinskiy/quarkus-test-suite
that referenced
this pull request
Aug 8, 2023
- Rename properties - use recommended image[2] as a base for native s2i - use the same base jvm image as in framework[3] [1] quarkus-qe/quarkus-test-framework#309 [2] https://github.com/quarkusio/quarkus-images#quarkus-images-1: ``` ubi-quarkus-native-binary-s2i - S2I builder image for OpenShift taking a pre-built native executable as input ``` [3] https://github.com/quarkus-qe/quarkus-test-framework/blob/main/quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/model/QuarkusProperties.java#L26
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The properties
ts.global.s2i.quarkus.jvm.builder.imageandts.global.s2i.quarkus.native.builder.imageproperties have been deleted in favour of the Quarkus official ones:Moreover, when using the OpenShift extension, if the user does not supply the
quarkus.openshift.base-xxx-image, the framework will use the ones fromquarkus.s2i.base-xxx-image.