Skip to content

HDDS-8825. Use apache/hadoop 3.3.5 docker image #4963

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 5 commits into from
Jun 23, 2023
Merged

HDDS-8825. Use apache/hadoop 3.3.5 docker image #4963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27f28d5
Use docker image from official Apache Hadoop.
jojochuang Jun 12, 2023
234f49d
Use apache/hadoop image if Hadoop is 3.3.x; otherwise use flokkr/hadoop.
jojochuang Jun 22, 2023
e34e4ab
Hack
jojochuang Jun 22, 2023
f40345d
Remove the hack. apache/hadoop has a 3.3.5 tagged image
jojochuang Jun 22, 2023
9349de6
Secure MR test use apache/hadoop 3.3.5 image
jojochuang Jun 22, 2023
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
8 changes: 7 additions & 1 deletion hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,15 @@ export OZONE_DIR=/opt/ozone
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"

for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.1; do
for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.5; do
export HADOOP_VERSION
export HADOOP_MAJOR_VERSION=${HADOOP_VERSION%%.*}
# Check if $HADOOP_VERSION starts with the prefix "3.3."
if [[ $HADOOP_VERSION == 3.3.* ]]; then
export HADOOP_IMAGE=apache/hadoop
else
export HADOOP_IMAGE=flokkr/hadoop
fi

docker-compose --ansi never --profile hadoop up -d nm rm

Expand Down
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-ha/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=flokkr/hadoop
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_OPTS=
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=flokkr/hadoop
HADOOP_IMAGE=apache/hadoop
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_OPTS=
4 changes: 2 additions & 2 deletions hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=flokkr/hadoop
HADOOP_VERSION=3.3.1
HADOOP_IMAGE=apache/hadoop
HADOOP_VERSION=3.3.5
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
Expand Down