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"