From aec63719ba4b57fd01e8423d09f5bf340f722013 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Fri, 13 Dec 2024 18:14:31 +0100 Subject: [PATCH 1/3] Upgrade behave tests to 35.0.0.Beta1 --- .../tests/features/legacy-elytron.feature | 2 +- .../tests/features/legacy-s2i.feature | 16 ++++++++-------- .../tests/features/messaging.feature | 2 +- .../tests/features/no-jdk11.feature | 2 +- .../tests/features/oidc.feature | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wildfly-builder-image/tests/features/legacy-elytron.feature b/wildfly-builder-image/tests/features/legacy-elytron.feature index 6c0ffc48..571b5b99 100644 --- a/wildfly-builder-image/tests/features/legacy-elytron.feature +++ b/wildfly-builder-image/tests/features/legacy-elytron.feature @@ -5,7 +5,7 @@ Scenario: Build elytron app Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-web-security with env and true using legacy-s2i-images-ee-10-test-apps | variable | value | | GALLEON_PROVISION_LAYERS | datasources-web-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | Then container log should contain WFLYSRV0025 Scenario: check Elytron configuration with elytron core realms security domain fail diff --git a/wildfly-builder-image/tests/features/legacy-s2i.feature b/wildfly-builder-image/tests/features/legacy-s2i.feature index 3a135035..ab817b6f 100644 --- a/wildfly-builder-image/tests/features/legacy-s2i.feature +++ b/wildfly-builder-image/tests/features/legacy-s2i.feature @@ -16,7 +16,7 @@ Scenario: Test preconfigure.sh | variable | value | | TEST_EXTENSION_PRE_ADD_PROPERTY | foo | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "ROOT.war" And check that page is served @@ -31,12 +31,12 @@ Scenario: Test preconfigure.sh Given failing s2i build http://github.com/openshift/openshift-jee-sample from . using master | variable | value | | GALLEON_PROVISION_LAYERS | foo | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | Scenario: Test default cloud config Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images | variable | value | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | | GALLEON_PROVISION_LAYERS | cloud-default-config | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "ROOT.war" @@ -48,7 +48,7 @@ Scenario: Test preconfigure.sh Scenario: Test cloud-server, exclude jaxrs Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images | variable | value | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | | GALLEON_PROVISION_LAYERS | cloud-server,-jaxrs | Then container log should contain WFLYSRV0025 And check that page is served @@ -63,7 +63,7 @@ Scenario: Test external driver created during s2i. | variable | value | | ENV_FILES | /opt/server/standalone/configuration/datasources.env | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | Then container log should contain WFLYSRV0025 And check that page is served | property | value | @@ -78,7 +78,7 @@ Scenario: Test external driver created during s2i. | ENV_FILES | /opt/server/standalone/configuration/datasources.env | | DISABLE_BOOT_SCRIPT_INVOKER | true | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | Then container log should contain Configuring the server using embedded server Then container log should contain WFLYSRV0025 And check that page is served @@ -92,7 +92,7 @@ Scenario: Test external driver created during s2i. Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-binary with env and True using legacy-s2i-images | variable | value | | GALLEON_PROVISION_LAYERS | jaxrs-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "app.war" And check that page is served @@ -105,7 +105,7 @@ Scenario: Test external driver created during s2i. | variable | value | | MAVEN_S2I_ARTIFACT_DIRS | app1/target,app2/target | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ### Then container log should contain WFLYSRV0010: Deployed "App1.war" Then container log should contain WFLYSRV0010: Deployed "App2.war" diff --git a/wildfly-builder-image/tests/features/messaging.feature b/wildfly-builder-image/tests/features/messaging.feature index bf1e8c33..3da36f82 100644 --- a/wildfly-builder-image/tests/features/messaging.feature +++ b/wildfly-builder-image/tests/features/messaging.feature @@ -5,7 +5,7 @@ Scenario: Configure amq7 remote broker Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and true using legacy-s2i-images | variable | value | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | | MQ_SERVICE_PREFIX_MAPPING | wf-app-amq7=TEST | | WF_APP_AMQ_TCP_SERVICE_HOST | 127.0.0.1 | | WF_APP_AMQ_TCP_SERVICE_PORT | 5678 | diff --git a/wildfly-builder-image/tests/features/no-jdk11.feature b/wildfly-builder-image/tests/features/no-jdk11.feature index 0377a5fa..59c67c69 100644 --- a/wildfly-builder-image/tests/features/no-jdk11.feature +++ b/wildfly-builder-image/tests/features/no-jdk11.feature @@ -5,7 +5,7 @@ Feature: Wildfly Legacy s2i tests that can't run on JDK11 Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images | variable | value | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-preview-feature-pack:34.0.1.Final, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-preview-feature-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:7.0.2.Final | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "ROOT.war" And check that page is served diff --git a/wildfly-builder-image/tests/features/oidc.feature b/wildfly-builder-image/tests/features/oidc.feature index 46b78171..670f7775 100644 --- a/wildfly-builder-image/tests/features/oidc.feature +++ b/wildfly-builder-image/tests/features/oidc.feature @@ -24,7 +24,7 @@ Feature: OIDC tests Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-elytron-oidc-client-legacy with env and True using main | variable | value | | GALLEON_PROVISION_LAYERS | cloud-server,elytron-oidc-client | - | GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:34.0.1.Final,org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:35.0.0.Beta1,org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final | Scenario: Check oidc subsystem configuration, legacy. Given XML namespaces | prefix | url | From 1b88e5c47ed741c992b2dc0693561a3f6aa962ad Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Fri, 13 Dec 2024 22:27:30 +0100 Subject: [PATCH 2/3] No more JDK11 images --- .github/workflows/main.yml | 2 +- .github/workflows/v2-push.yml | 2 +- CONTRIBUTING.md | 2 +- README.md | 8 -------- docs/index.adoc | 4 ---- wildfly-builder-image/jdk11-overrides.yaml | 18 ------------------ wildfly-runtime-image/jdk11-overrides.yaml | 14 -------------- 7 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 wildfly-builder-image/jdk11-overrides.yaml delete mode 100644 wildfly-runtime-image/jdk11-overrides.yaml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ffc466b..bd343d13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - jdk: [jdk11, jdk17, jdk21] + jdk: [jdk17, jdk21] steps: - name: Update hosts - linux if: matrix.os == 'ubuntu-latest' diff --git a/.github/workflows/v2-push.yml b/.github/workflows/v2-push.yml index bf16b816..38e5685c 100644 --- a/.github/workflows/v2-push.yml +++ b/.github/workflows/v2-push.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - jdk: [jdk11, jdk17, jdk21] + jdk: [jdk17, jdk21] steps: - id: files if: ${{ github.event_name == 'push' }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9a9bff9..60cb69f8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ For example: git remote add upstream https://github.com/wildfly/wildfly-s2i ``` -To build JDK 11, JDK 17 and JDK 21 builder and runtime images look at this : [Readme](https://github.com/wildfly/wildfly-s2i/blob/main/README.md#building-the-images). +To build JDK 17 and JDK 21 builder and runtime images look at this : [Readme](https://github.com/wildfly/wildfly-s2i/blob/main/README.md#building-the-images). To run the behave tests: diff --git a/README.md b/README.md index da1f36e6..8f4f52d6 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,6 @@ Releasing new images is no more bound to WildFly server releases. Releases are d You must have [cekit](https://github.com/cekit/cekit) installed. -## Building the JDK11 images - -* `cd wildfly-builder-image; cekit build --overrides=jdk11-overrides.yaml docker` -* `cd wildfly-runtime-image; cekit build --overrides=jdk11-overrides.yaml docker` - ## Building the JDK17 images * `cd wildfly-builder-image; cekit build --overrides=jdk17-overrides.yaml docker` @@ -43,9 +38,6 @@ The steps are as follow: * call `docker system prune` to release unreferenced images. * If a failure occurs, the workflow is aborted and the logs are collected. -NOTE: Some tests are not supported on JDK11 (for example, starting WildFly 32, WildFly preview requires JDK17 as its minimal JDK version). Such tests -are not executed on JDK11 and are all located in the feature file: `no-jdk11.feature` - ### Understanding the failure logs The features test execution has been split into multiple executions due to created images resource consumption and log size. diff --git a/docs/index.adoc b/docs/index.adoc index 8ddeac8d..7a666700 100644 --- a/docs/index.adoc +++ b/docs/index.adoc @@ -4,8 +4,6 @@ An image containing all you need to run a WildFly Server. This image is to be used in a docker build to install a WildFly server. -* JDK11 based runtime image: `docker pull quay.io/wildfly/wildfly-runtime:latest-jdk11` - * JDK17 based runtime image: `docker pull quay.io/wildfly/wildfly-runtime:latest-jdk17` * JDK21 based runtime image: `docker pull quay.io/wildfly/wildfly-runtime:latest-jdk21` @@ -34,8 +32,6 @@ Documentation of the WildFly Maven plugin can be found link:https://docs.wildfly === S2I builder images -* JDK11 based builder image: `docker pull quay.io/wildfly/wildfly-s2i:latest-jdk11` - * JDK17 based builder image: `docker pull quay.io/wildfly/wildfly-s2i:latest-jdk17` * JDK21 based builder image: `docker pull quay.io/wildfly/wildfly-s2i:latest-jdk21` diff --git a/wildfly-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml deleted file mode 100644 index 81a441b4..00000000 --- a/wildfly-builder-image/jdk11-overrides.yaml +++ /dev/null @@ -1,18 +0,0 @@ -schema_version: 1 - -description: "The WildFly s2i builder image, JDK 11" -version: &imgVersion "2.0.2-jdk11-snapshot" -labels: - - name: io.k8s.display-name - value: "WildFly s2i builder image, JDK 11" - - name: "org.jboss.product.version" - value: *imgVersion -envs: - - name: IMAGE_VERSION - value: *imgVersion -modules: - install: - - name: jboss.container.openjdk.jdk - version: "11" - - name: jboss.container.maven - version: "3.8.11" diff --git a/wildfly-runtime-image/jdk11-overrides.yaml b/wildfly-runtime-image/jdk11-overrides.yaml deleted file mode 100644 index 92492837..00000000 --- a/wildfly-runtime-image/jdk11-overrides.yaml +++ /dev/null @@ -1,14 +0,0 @@ -schema_version: 1 - -description: "The WildFly runtime image, JDK 11" -version: &imgVersion "2.0.2-jdk11-snapshot" -labels: - - name: "org.jboss.product.version" - value: *imgVersion -envs: - - name: IMAGE_VERSION - value: *imgVersion -modules: - install: - - name: jboss.container.openjdk.jdk - version: "11" From bedac8941e791d1f73f82f029e8fd8324a4fe641 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Fri, 13 Dec 2024 22:52:16 +0100 Subject: [PATCH 3/3] ubuntu-22.04 to workaround Error during unshare --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd343d13..0fd121fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + # workaround for https://github.com/actions/runner-images/issues/10443 + os: [ubuntu-22.04] jdk: [jdk17, jdk21] steps: - name: Update hosts - linux