Skip to content

HDDS-8247. Run acceptance tests with JDK 17 #6428

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.

Sign up for GitHub

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

Merged
adoroszlai merged 4 commits into from
Mar 25, 2024
Merged

HDDS-8247. Run acceptance tests with JDK 17 #6428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
274966c
HDDS-8247. Bump JDK in ozone-runner to 17.0.2
adoroszlai Mar 16, 2024
763802b
unset JAVA_HOME
adoroszlai Mar 16, 2024
7abaf19
set JAVA_HOME for ssh
adoroszlai Mar 17, 2024
bb1f1fc
Merge remote-tracking branch 'origin/master' into HDDS-8247
adoroszlai Mar 24, 2024
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 hadoop-ozone/dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
<docker.ozone-runner.version>20230615-1</docker.ozone-runner.version>
<docker.ozone-runner.version>20240316-jdk17-1</docker.ozone-runner.version>
<docker.ozone-testkr5b.image>apache/ozone-testkrb5:20230318-1</docker.ozone-testkr5b.image>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so far -->
</properties>
Expand Down
16 changes: 0 additions & 16 deletions hadoop-ozone/dist/src/main/compose/ozone-om-ha/.ssh/environment
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ RUN sudo chown hadoop /opt
RUN sudo chmod 600 /opt/.ssh/*
RUN sudo chmod 700 /opt/.ssh

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

# Install required robot framework libraries
RUN sudo pip3 install robotframework-sshlibrary
Expand Down
16 changes: 0 additions & 16 deletions hadoop-ozone/dist/src/main/compose/ozonescripts/.ssh/environment
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,7 @@ RUN sudo chown hadoop /opt
RUN sudo chmod 600 /opt/.ssh/*
RUN sudo chmod 700 /opt/.ssh

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

CMD ["sudo","/usr/sbin/sshd","-D"]
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=*
#BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm

OZONE_DATANODE_SECURE_USER=root
JAVA_HOME=/usr/lib/jvm/jre
JSVC_HOME=/usr/bin

OZONE_CONF_DIR=/etc/hadoop
Expand Down
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ CORE-SITE.XML_hadoop.security.authorization=false
#BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm

OZONE_DATANODE_SECURE_USER=root
JAVA_HOME=/usr/lib/jvm/jre
JSVC_HOME=/usr/bin

OZONE_CLASSPATH=
Expand Down
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=*
#BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm

OZONE_DATANODE_SECURE_USER=root
JAVA_HOME=/usr/lib/jvm/jre
JSVC_HOME=/usr/bin

OZONE_CONF_DIR=/etc/hadoop
Expand Down