Skip to content

Commit

Permalink
Prep delivery 2401 (#58)
Browse files Browse the repository at this point in the history
* Switch Java version to jdk 17 + update the linter version.

* Remove duplicate entry

* Fix liberty location image
  • Loading branch information
lgrateau authored Nov 14, 2024
1 parent ffe919f commit 376aebc
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ REPOSITORY=ibmcom
PREFIXIMAGE=odm

# Liberty Version
FROMLIBERTY=ibmcom/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi
FROMLIBERTY=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build and test
on: [push]
env:
DOCKER_COMPOSE_VERSION: 1.29.2
FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.9-kernel-java11-openj9-ubi
FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi
HELM_VERSION: 3.6.2
ODM_VERSION: 9.0.0.1
ODMDOCKERDIR: docker
Expand Down
2 changes: 0 additions & 2 deletions charts/ibm-odm-metering/tests/lintOverride.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@ overrides:
reason: "Prefer to have cutomization section than configuration."
- rule: NoReadWriteMany
reason: "Needs to work on it. Too late for the 22.0.1 Release."
- rule: NoReadWriteMany
reason: "Needs to work on it. Too late for the 22.0.1 Release."
- rule: ContainerLivenessOverLongInitialDelaySeconds
reason: "Metering service take time to start"
3 changes: 1 addition & 2 deletions download-cv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set -ex

GH_API=https://github.ibm.com/api/v3
GH_REPO=${GH_API}/repos/IBMPrivateCloud/content-verification
# GH_LATEST=${GH_REPO}/releases/tags/v4.8.1
GH_LATEST=${GH_REPO}/releases/tags/v2.7.0
GH_LATEST=${GH_REPO}/releases/tags/v4.8.1
AUTH="Authorization: token ${GHE_TOKEN}"

response=$(curl --header "${AUTH}" --silent ${GH_LATEST})
Expand Down

0 comments on commit 376aebc

Please sign in to comment.