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.

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

Wlp 24.0.0.5 #70

Merged
merged 5 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
mkdir ~/cekit${{ env.CEKIT_VERSION }}
virtualenv ~/cekit${{ env.CEKIT_VERSION }}
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3
pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 request==2.31.0
- name: install s2i binary
run: |
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
mkdir ~/cekit${{ env.CEKIT_VERSION }}
python3 -m venv ~/cekit${{ env.CEKIT_VERSION }}
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3
pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 requests==2.31.0
- name: install s2i binary
run: |
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
Expand Down
4 changes: 2 additions & 2 deletions .one-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setup:

set_env S2I_URI "https://api.github.com/repos/openshift/source-to-image/releases/tags/v1.3.9"
set_env CEKIT_VERSION "4.9.1"
set_env LIBERTY_VERSION "24.0.0.4"
set_env LIBERTY_VERSION "24.0.0.5"

test:
abort_on_failure: false
Expand Down Expand Up @@ -94,7 +94,7 @@ containerize:
mkdir ~/cekit${CEKIT_VERSION}
python3 -m venv ~/cekit${CEKIT_VERSION}
pip3 install --upgrade pip
pip3 install cekit==${CEKIT_VERSION} docker==5.0.3 docker-squash odcs behave lxml setuptools_rust urllib3==1.26.15 packaging==21.3
pip3 install cekit==${CEKIT_VERSION} docker==5.0.3 docker-squash odcs behave lxml setuptools_rust urllib3==1.26.15 packaging==21.3 requests==2.31.0
. ~/cekit${CEKIT_VERSION}/bin/activate
echo "***** Installed CEKIT version ${CEKIT_VERSION} *****"
cekit --version
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LIBERTY_VERSION=24.0.0.4
LIBERTY_VERSION=24.0.0.5
JAVA8_IMAGE_VERSION=$(LIBERTY_VERSION)-java8
JAVA8_RUNTIME_IMAGE_VERSION=$(LIBERTY_VERSION)-runtime-java8
JAVA11_IMAGE_VERSION=$(LIBERTY_VERSION)-java11
Expand Down
4 changes: 2 additions & 2 deletions images/java21/builder/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ envs:
- name: S2I_DESTINATION
value: "/tmp"
- name: JAVA_HOME
value: /usr/local/jdk-21.0.1+12
value: /usr/local/jdk-21.0.2+13
- name: PATH
value: /usr/local/jdk-21.0.1+12/bin:$PATH
value: /usr/local/jdk-21.0.2+13/bin:$PATH

packages:
manager: microdnf
Expand Down
4 changes: 2 additions & 2 deletions modules/java21/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: "Module used to install IBM Semeru Java 21"
# Defined artifacts that are used to build the image
artifacts:
- name: semeru21.tar.gz
url: https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-open-jdk_x64_linux_21.0.1_12_openj9-0.42.0.tar.gz
sha256: ad575bc4b1fa9e9fa56661444b6153abfa147ec155845afa054472fa6357f026
url: https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.2%2B13_openj9-0.43.0/ibm-semeru-open-jdk_x64_linux_21.0.2_13_openj9-0.43.0.tar.gz
sha256: 7a7a186a7a48537519917331ec91d9180b961dcc7ea0f627a23fa369edab6f16
execute:
- script: install.sh