This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push: new c1069a6 HDDS-4362. Change hadoop32 test to use 3.2 image (#1521) c1069a6 is described below commit c1069a6319efb84e4e22c2babc6c237e292b0746 Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com> AuthorDate: Mon Oct 26 14:25:46 2020 +0100 HDDS-4362. Change hadoop32 test to use 3.2 image (#1521) --- hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env | 6 +++--- hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env | 3 ++- .../dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 8 ++++---- hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env index 87e7cce..602a96f 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env +++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env @@ -15,7 +15,7 @@ # limitations under the License. HDDS_VERSION=@hdds.version@ -HADOOP_IMAGE=apache/hadoop -HADOOP_VERSION=3 +HADOOP_IMAGE=flokkr/hadoop +HADOOP_VERSION=3.2.1 OZONE_RUNNER_VERSION=@docker.ozone-runner.version@ -HADOOP_OPTS= \ No newline at end of file +HADOOP_OPTS= diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env index 5aa2777..b4cd2f2 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env @@ -15,6 +15,7 @@ # limitations under the License. HDDS_VERSION=${hdds.version} -HADOOP_VERSION=3 +HADOOP_IMAGE=flokkr/hadoop +HADOOP_VERSION=3.2.1 OZONE_RUNNER_VERSION=${docker.ozone-runner.version} HADOOP_OPTS= diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml index 7854f08..eecc34b 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml @@ -27,7 +27,7 @@ services: volumes: - ../..:/opt/hadoop kms: - image: apache/hadoop:${HADOOP_VERSION} + image: ${HADOOP_IMAGE}:${HADOOP_VERSION} networks: - ozone ports: @@ -100,7 +100,7 @@ services: HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] rm: - image: apache/hadoop:${HADOOP_VERSION} + image: ${HADOOP_IMAGE}:${HADOOP_VERSION} hostname: rm networks: - ozone @@ -115,7 +115,7 @@ services: KERBEROS_KEYTABS: rm HTTP hadoop command: ["yarn", "resourcemanager"] nm: - image: apache/hadoop:${HADOOP_VERSION} + image: ${HADOOP_IMAGE}:${HADOOP_VERSION} hostname: nm networks: - ozone @@ -129,7 +129,7 @@ services: KERBEROS_KEYTABS: nm HTTP command: ["yarn","nodemanager"] jhs: - image: apache/hadoop:${HADOOP_VERSION} + image: ${HADOOP_IMAGE}:${HADOOP_VERSION} container_name: jhs hostname: jhs networks: diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh index 3763397..11989fd 100755 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh @@ -35,6 +35,7 @@ export OZONE_DIR=/opt/ozone # shellcheck source=/dev/null source "$COMPOSE_DIR/../testlib.sh" +execute_command_in_container rm sudo yum install -y krb5-workstation execute_robot_test rm kinit-hadoop.robot for scheme in o3fs ofs; do --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org