Skip to content

Commit 62c332d

Browse files
committed
[OPENJDK-3419] Initial changes for JDK11-ELS images
Update github workflow and README.adoc Signed-off-by: Antonio Vieiro <[email protected]>
1 parent 6416c18 commit 62c332d

File tree

4 files changed

+8
-22
lines changed

4 files changed

+8
-22
lines changed

.github/workflows/image-workflow-template.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: clear docker credentials
4040
run: docker logout
4141

42-
- name: Behave Tests
43-
run: |
44-
echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
45-
cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
42+
# - name: Behave Tests
43+
# run: |
44+
# echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
45+
# cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps

.github/workflows/ubi9-openjdk-11.yml renamed to .github/workflows/openjdk-11-rhel9.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: UBI9 OpenJDK 11 S2I Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
IMAGE: ubi9-openjdk-11
5+
IMAGE: openjdk-11-rhel-9
66
jobs:
77
call-openjdkci:
88
uses: ./.github/workflows/image-workflow-template.yml
99
with:
10-
image: ubi9-openjdk-11
10+
image: openjdk-11-rhel9

.github/workflows/ubi9-openjdk-11-runtime.yml renamed to .github/workflows/openjdk-11-runtime-rhel9.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: UBI9 OpenJDK 11 Runtime S2I Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
IMAGE: ubi9-openjdk-11-runtime
5+
IMAGE: openjdk-11-runtime-rhel9
66
jobs:
77
call-openjdkci:
88
uses: ./.github/workflows/image-workflow-template.yml
99
with:
10-
image: ubi9-openjdk-11-runtime
10+
image: openjdk-11-runtime-rhel9

README.adoc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ These are the OpenJDK Source to Image (S2I) images for Red Hat OpenShift.
66

77
### From https://access.redhat.com/containers/[Red Hat Container Catalog]
88

9-
* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-11/61ee7bafed74b2ffb22b07ab[ubi9/openjdk-11]
109
* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-17/61ee7c26ed74b2ffb22b07f6[ubi9/openjdk-17]
11-
* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-11-runtime/61ee7d1c33f211c45407a91c[ubi9/openjdk-11-runtime]
1210
* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-17-runtime/61ee7d45384a3eb331996bee[ubi9/openjdk-17-runtime]
1311

1412
The UBI9-based OpenJDK images are available under the terms of the
@@ -30,24 +28,12 @@ These sources are prepared and tested for Cekit 4.1.1.
3028

3129
## Red Hat Universal Base Image 9 versions
3230

33-
### Red Hat Universal Base Image 9 with OpenJDK 11
34-
35-
cekit --descriptor ubi9-openjdk-11.yaml build podman
36-
37-
This will produce an image named `ubi9/openjdk-11`.
38-
3931
### Red Hat Universal Base Image 9 with OpenJDK 17
4032

4133
cekit --descriptor ubi9-openjdk-17.yaml build podman
4234

4335
This will produce an image named `ubi9/openjdk-17`.
4436

45-
### Red Hat Universal Base Image 9 with OpenJDK 11 - Runtime
46-
47-
cekit --descriptor ubi9-openjdk-11-runtime.yaml build podman
48-
49-
This will produce an image named `ubi9/openjdk-11-runtime`.
50-
5137
### Red Hat Universal Base Image 9 with OpenJDK 17 - Runtime
5238

5339
cekit --descriptor ubi9-openjdk-17-runtime.yaml build podman

0 commit comments

Comments
 (0)