Skip to content

Commit bb94ccf

Browse files
author
Jiang, Yu-tao
committed
update script java version
1 parent 4e4ac10 commit bb94ccf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

scripts/build_image

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ docker build -t mbtci${JAVA_VERSION}${NODE_VERSION}:${MBT_VERSION} .
2121
# test image
2222
if [ "$JAVA_MAJOR_VERSION" = "8" ] || [ "$JAVA_MAJOR_VERSION" = "11" ] || \
2323
[ "$JAVA_MAJOR_VERSION" = "17" ] || [ "$JAVA_MAJOR_VERSION" = "19" ] || \
24-
[ "$JAVA_MAJOR_VERSION" = "21" ]|| [ "$JAVA_MAJOR_VERSION" = "22" ]; then
24+
[ "$JAVA_MAJOR_VERSION" = "21" ] || [ "$JAVA_MAJOR_VERSION" = "23" ]; then
2525
cp test/goss/goss_template.yaml test/goss/goss.yaml
2626
sed_i "s/NODE_VERSION_TEMPLATE/${NODE_VERSION_TEMPLATE}/" test/goss/goss.yaml
2727
sed_i "s/JAVA_VERSION_TEMPLATE/${JAVA_VERSION_TEMPLATE}/" test/goss/goss.yaml

scripts/common_image

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export NODE_MAJOR_VERSION="$(echo ${NODE_VERSION_TEMPLATE}|awk -F. '{printf "%d"
1111

1212
echo "Java major version: ${JAVA_MAJOR_VERSION}, Node major version: ${NODE_MAJOR_VERSION}"
1313

14-
if ([ "$JAVA_MAJOR_VERSION" -ne "11" ] && [ "$JAVA_MAJOR_VERSION" -ne "17" ] && [ "$JAVA_MAJOR_VERSION" -ne "19" ] && [ "$JAVA_MAJOR_VERSION" -ne "21" ] && [ "$JAVA_MAJOR_VERSION" -ne "22" ]) || \
14+
if ([ "$JAVA_MAJOR_VERSION" -ne "11" ] && [ "$JAVA_MAJOR_VERSION" -ne "17" ] && [ "$JAVA_MAJOR_VERSION" -ne "19" ] && [ "$JAVA_MAJOR_VERSION" -ne "21" ] && [ "$JAVA_MAJOR_VERSION" -ne "23" ]) || \
1515
([ "$NODE_MAJOR_VERSION" -ne "14" ] && [ "$NODE_MAJOR_VERSION" -ne "16" ] && [ "$NODE_MAJOR_VERSION" -ne "18" ] && [ "$NODE_MAJOR_VERSION" -ne "20" ] && [ "$NODE_MAJOR_VERSION" -ne "22" ])
1616
then
1717
echo "Java: ${JAVA_MAJOR_VERSION}, Node: ${NODE_MAJOR_VERSION} combination is not supported!"

0 commit comments

Comments
 (0)