Skip to content

Commit 77384ea

Browse files
authored
HDDS-8247. Run acceptance tests with JDK 17 (apache#6428)
1 parent e39166f commit 77384ea

8 files changed

Lines changed: 6 additions & 38 deletions

File tree

hadoop-ozone/dist/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<properties>
2929
<file.encoding>UTF-8</file.encoding>
3030
<downloadSources>true</downloadSources>
31-
<docker.ozone-runner.version>20230615-1</docker.ozone-runner.version>
31+
<docker.ozone-runner.version>20240316-jdk17-1</docker.ozone-runner.version>
3232
<docker.ozone-testkr5b.image>apache/ozone-testkrb5:20230318-1</docker.ozone-testkr5b.image>
3333
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so far -->
3434
</properties>

hadoop-ozone/dist/src/main/compose/ozone-om-ha/.ssh/environment

Lines changed: 0 additions & 16 deletions
This file was deleted.

hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ RUN sudo chown hadoop /opt
3636
RUN sudo chmod 600 /opt/.ssh/*
3737
RUN sudo chmod 700 /opt/.ssh
3838

39-
RUN sudo sh -c 'echo "export JAVA_HOME=/usr/lib/jvm/jre/" >> /etc/profile'
39+
RUN echo "export JAVA_HOME=$JAVA_HOME" | sudo sh -c 'cat >> /etc/profile'
40+
RUN echo "JAVA_HOME=$JAVA_HOME" | sh -c 'cat >> /opt/.ssh/environment'
4041

4142
# Install required robot framework libraries
4243
RUN sudo pip3 install robotframework-sshlibrary

hadoop-ozone/dist/src/main/compose/ozonescripts/.ssh/environment

Lines changed: 0 additions & 16 deletions
This file was deleted.

hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@ RUN sudo chown hadoop /opt
3535
RUN sudo chmod 600 /opt/.ssh/*
3636
RUN sudo chmod 700 /opt/.ssh
3737

38-
RUN sudo sh -c 'echo "export JAVA_HOME=/usr/lib/jvm/jre/" >> /etc/profile'
38+
RUN echo "export JAVA_HOME=$JAVA_HOME" | sudo sh -c 'cat >> /etc/profile'
39+
RUN echo "JAVA_HOME=$JAVA_HOME" | sh -c 'cat >> /opt/.ssh/environment'
40+
3941
CMD ["sudo","/usr/sbin/sshd","-D"]

hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=*
157157
#BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm
158158

159159
OZONE_DATANODE_SECURE_USER=root
160-
JAVA_HOME=/usr/lib/jvm/jre
161160
JSVC_HOME=/usr/bin
162161

163162
OZONE_CONF_DIR=/etc/hadoop

hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ CORE-SITE.XML_hadoop.security.authorization=false
7575
#BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm
7676

7777
OZONE_DATANODE_SECURE_USER=root
78-
JAVA_HOME=/usr/lib/jvm/jre
7978
JSVC_HOME=/usr/bin
8079

8180
OZONE_CLASSPATH=

hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=*
149149
#BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm
150150

151151
OZONE_DATANODE_SECURE_USER=root
152-
JAVA_HOME=/usr/lib/jvm/jre
153152
JSVC_HOME=/usr/bin
154153

155154
OZONE_CONF_DIR=/etc/hadoop

0 commit comments

Comments
 (0)