Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ubi9 and ppc64le #482

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Ubi9 and ppc64le #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff93f55
Add ppc64le arch
jfdenise Aug 27, 2024
67e20ec
Switch images to ubi9. Bump version to 2.x
jfdenise Aug 27, 2024
f8144fd
UBI9: Rely on dynamic-resources 2.0. Updated JVM options tests
jfdenise Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ jobs:
ls -l
chmod +x ./skopeo
./skopeo --version
- name: Verify latest ubi8-minimal
- name: Verify latest ubi9-minimal
run: |
podman pull registry.access.redhat.com/ubi8/ubi-minimal
podman image ls | grep ubi8
podman pull registry.access.redhat.com/ubi9/ubi-minimal
podman image ls | grep ubi9
- name: Install qemu dependency
run: |
sudo apt-get update
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
image: ${{ env.WILDFLY_S2I_BUILDER_IMAGE }}
tags: ${{ env.WILDFLY_IMAGE_VERSION }}
context: ./wildfly-builder-image/target/image
platforms: linux/amd64, linux/arm64
platforms: linux/amd64, linux/arm64, linux/ppc64le
containerfiles: |
./wildfly-builder-image/target/image/Dockerfile
- name: Buildah multi archs Runtime Build
Expand All @@ -105,7 +105,7 @@ jobs:
image: ${{ env.WILDFLY_S2I_RUNTIME_IMAGE }}
tags: ${{ env.WILDFLY_IMAGE_VERSION }}
context: ./wildfly-runtime-image/target/image
platforms: linux/amd64, linux/arm64
platforms: linux/amd64, linux/arm64, linux/ppc64le
containerfiles: |
./wildfly-runtime-image/target/image/Dockerfile
- name: Skopeo copy Builder and Runtime images to Docker local repo for tests
Expand Down
9 changes: 7 additions & 2 deletions wildfly-builder-image/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

name: &imgName "wildfly/wildfly-s2i"
from: "registry.access.redhat.com/ubi8/ubi-minimal"
from: "registry.access.redhat.com/ubi9/ubi-minimal"
version: "unknown"
labels:
- name: name
Expand Down Expand Up @@ -43,19 +43,24 @@ modules:
- name: openjdk
git:
url: https://github.com/jboss-container-images/openjdk
ref: ubi8
ref: ubi9
- name: wildfly-cekit-modules
git:
url: https://github.com/wildfly/wildfly-cekit-modules
ref: main
- name: wildfly-modules
path: ../wildfly-modules
install:
- name: jboss.container.user
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this new module for? Is it related to the switch to UBI 9?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, openjdk image, in their ubi9 branch renamed the user to default. We are using jboss.

version: "2.0+jboss1"
- name: jboss.container.util.pkg-update
- name: jboss.container.openjdk.jdk
- name: jboss.container.maven
- name: jboss.container.wildfly.dynamic-resources
version: "2.0"
- name: jboss.container.maven.s2i
- name: jboss.container.wildfly.run
version: "2.0"
# Remove this dependency to not support env variable based provisioning and legacy workflow
# Put it prior to wildfly.s2i-wildfly module in case this last module overrides env variables.
- name: jboss.container.wildfly.s2i.legacy
Expand Down
2 changes: 1 addition & 1 deletion wildfly-builder-image/jdk11-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

description: "The WildFly s2i builder image, JDK 11"
version: &imgVersion "1.1.6-jdk11-snapshot"
version: &imgVersion "2.0.0-jdk11-snapshot"
labels:
- name: io.k8s.display-name
value: "WildFly s2i builder image, JDK 11"
Expand Down
2 changes: 1 addition & 1 deletion wildfly-builder-image/jdk17-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

description: "The WildFly s2i builder image, JDK 17"
version: &imgVersion "1.1.6-jdk17-snapshot"
version: &imgVersion "2.0.0-jdk17-snapshot"
labels:
- name: io.k8s.display-name
value: "WildFly s2i builder image, JDK 17"
Expand Down
4 changes: 2 additions & 2 deletions wildfly-builder-image/jdk21-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

description: "The WildFly s2i builder image, JDK 21"
version: &imgVersion "1.1.6-jdk21-snapshot"
version: &imgVersion "2.0.0-jdk21-snapshot"
labels:
- name: io.k8s.display-name
value: "WildFly s2i builder image, JDK 21"
Expand All @@ -15,4 +15,4 @@ modules:
- name: jboss.container.openjdk.jdk
version: "21"
- name: jboss.container.maven
version: "3.8.17"
version: "3.8.21"
12 changes: 2 additions & 10 deletions wildfly-builder-image/tests/features/basic.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,23 +418,15 @@ Scenario: Test resource adapter extension, galleon s2i
Scenario: Check for adjusted heap sizes
When container integ- is started with args
| arg | value |
| env_json | {"JAVA_MAX_MEM_RATIO": 25, "JAVA_INITIAL_MEM_RATIO": 50} |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:InitialRAMPercentage=50.0\s
And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxRAMPercentage=25.0\s
| env_json | {"JAVA_MAX_MEM_RATIO": 25} |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxRAMPercentage=25.0\s

# CLOUD-193 (mem-limit); CLOUD-459 (default heap size == max)
Scenario: CLOUD-193 Check for dynamic resource allocation
When container integ- is started with env
| variable | value |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxRAMPercentage=80.0\s

# CLOUD-459 (override default heap size)
Scenario: CLOUD-459 Check for adjusted default heap size
When container integ- is started with args
| arg | value |
| env_json | {"INITIAL_HEAP_PERCENT": 0.5} |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:InitialRAMPercentage=50.0\s

Scenario: Check JAVA_DIAGNOSTICS disabled
When container integ- is started with env
| variable | value |
Expand Down
13 changes: 2 additions & 11 deletions wildfly-builder-image/tests/features/vanilla.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,24 +114,15 @@ Scenario: Check default GC configuration
Scenario: Check for adjusted heap sizes
When container integ- is started with args
| arg | value |
| env_json | {"JAVA_MAX_MEM_RATIO": 25, "JAVA_INITIAL_MEM_RATIO": 50} |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:InitialRAMPercentage=50.0\s
And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxRAMPercentage=25.0\s
| env_json | {"JAVA_MAX_MEM_RATIO": 25} |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxRAMPercentage=25.0\s

# CLOUD-193 (mem-limit); CLOUD-459 (default heap size == max)
Scenario: CLOUD-193 Check for dynamic resource allocation
When container integ- is started with env
| variable | value |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxRAMPercentage=80.0\s


# CLOUD-459 (override default heap size)
Scenario: CLOUD-459 Check for adjusted default heap size
When container integ- is started with args
| arg | value |
| env_json | {"INITIAL_HEAP_PERCENT": 0.5} |
Then container log should match regex ^ *JAVA_OPTS: *.* -XX:InitialRAMPercentage=50.0\s

Scenario: Check if image shuts down with TERM signal
When container integ- is started with env
| variable | value |
Expand Down
9 changes: 6 additions & 3 deletions wildfly-runtime-image/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

name: &imgName "wildfly/wildfly-runtime"
from: "registry.access.redhat.com/ubi8/ubi-minimal"
from: "registry.access.redhat.com/ubi9/ubi-minimal"
version: "unknown"
labels:
- name: name
Expand Down Expand Up @@ -31,19 +31,22 @@ modules:
- name: openjdk
git:
url: https://github.com/jboss-container-images/openjdk
ref: ubi8
ref: ubi9
- name: wildfly-cekit-modules
git:
url: https://github.com/wildfly/wildfly-cekit-modules
ref: main
- name: wildfly-modules
path: ../wildfly-modules
install:
- name: jboss.container.user
version: "2.0+jboss1"
- name: jboss.container.util.pkg-update
- name: jboss.container.openjdk.jdk
- name: jboss.container.java.jvm.bash
- name: jboss.container.wildfly.dynamic-resources
version: "2.0"
- name: jboss.container.wildfly.run
version: "2.0"
- name: jboss.container.wildfly.cleanup

packages:
Expand Down
2 changes: 1 addition & 1 deletion wildfly-runtime-image/jdk11-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

description: "The WildFly runtime image, JDK 11"
version: &imgVersion "1.1.6-jdk11-snapshot"
version: &imgVersion "2.0.0-jdk11-snapshot"
labels:
- name: "org.jboss.product.version"
value: *imgVersion
Expand Down
2 changes: 1 addition & 1 deletion wildfly-runtime-image/jdk17-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

description: "The WildFly runtime image, JDK 17"
version: &imgVersion "1.1.6-jdk17-snapshot"
version: &imgVersion "2.0.0-jdk17-snapshot"
labels:
- name: "org.jboss.product.version"
value: *imgVersion
Expand Down
2 changes: 1 addition & 1 deletion wildfly-runtime-image/jdk21-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

description: "The WildFly runtime image, JDK 21"
version: &imgVersion "1.1.6-jdk21-snapshot"
version: &imgVersion "2.0.0-jdk21-snapshot"
labels:
- name: "org.jboss.product.version"
value: *imgVersion
Expand Down
Loading