You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/10/04 12:58:48 UTC
[hadoop] branch trunk updated: HDDS-2216. Rename
HADOOP_RUNNER_VERSION to OZONE_RUNNER_VERSION in compose .env files.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new bca014b HDDS-2216. Rename HADOOP_RUNNER_VERSION to OZONE_RUNNER_VERSION in compose .env files.
bca014b is described below
commit bca014b0e03fb37711022ee6ed4272c346cdf5c9
Author: cxorm <li...@gmail.com>
AuthorDate: Thu Oct 3 20:47:36 2019 +0800
HDDS-2216. Rename HADOOP_RUNNER_VERSION to OZONE_RUNNER_VERSION in compose .env files.
Closes #1570.
---
hadoop-ozone/dev-support/checks/blockade.sh | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env | 2 +-
.../dist/src/main/compose/ozone-hdfs/docker-compose.yaml | 6 +++---
hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/.env | 2 +-
.../src/main/compose/ozone-mr/hadoop27/docker-compose.yaml | 8 ++++----
hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/.env | 2 +-
.../src/main/compose/ozone-mr/hadoop31/docker-compose.yaml | 8 ++++----
hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env | 2 +-
.../src/main/compose/ozone-mr/hadoop32/docker-compose.yaml | 8 ++++----
hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env | 2 +-
.../dist/src/main/compose/ozone-om-ha/docker-compose.yaml | 10 +++++-----
hadoop-ozone/dist/src/main/compose/ozone-recon/.env | 2 +-
.../dist/src/main/compose/ozone-recon/docker-compose.yaml | 8 ++++----
hadoop-ozone/dist/src/main/compose/ozone-topology/.env | 2 +-
.../dist/src/main/compose/ozone-topology/docker-compose.yaml | 12 ++++++------
hadoop-ozone/dist/src/main/compose/ozone/.env | 2 +-
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml | 6 +++---
hadoop-ozone/dist/src/main/compose/ozoneblockade/.env | 2 +-
.../dist/src/main/compose/ozoneblockade/docker-compose.yaml | 8 ++++----
hadoop-ozone/dist/src/main/compose/ozoneperf/.env | 2 +-
.../dist/src/main/compose/ozoneperf/docker-compose.yaml | 10 +++++-----
hadoop-ozone/dist/src/main/compose/ozones3-haproxy/.env | 2 +-
.../src/main/compose/ozones3-haproxy/docker-compose.yaml | 12 ++++++------
hadoop-ozone/dist/src/main/compose/ozones3/.env | 2 +-
.../dist/src/main/compose/ozones3/docker-compose.yaml | 8 ++++----
hadoop-ozone/dist/src/main/compose/ozonescripts/.env | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env | 2 +-
.../dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 8 ++++----
hadoop-ozone/dist/src/main/compose/ozonesecure/.env | 2 +-
.../dist/src/main/compose/ozonesecure/docker-compose.yaml | 10 +++++-----
.../network-tests/src/test/blockade/ozone/cluster.py | 4 ++--
31 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/hadoop-ozone/dev-support/checks/blockade.sh b/hadoop-ozone/dev-support/checks/blockade.sh
index f8b25c1..a48d2b5 100755
--- a/hadoop-ozone/dev-support/checks/blockade.sh
+++ b/hadoop-ozone/dev-support/checks/blockade.sh
@@ -21,7 +21,7 @@ OZONE_VERSION=$(grep "<ozone.version>" "$DIR/../../pom.xml" | sed 's/<[^>]*>//g'
cd "$DIR/../../dist/target/ozone-$OZONE_VERSION/tests" || exit 1
source ${DIR}/../../dist/target/ozone-${OZONE_VERSION}/compose/ozoneblockade/.env
-export HADOOP_RUNNER_VERSION
+export OZONE_RUNNER_VERSION
export HDDS_VERSION
python -m pytest -s blockade
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env
index 8916fc3..df9065c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HADOOP_VERSION=3
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
index cd06635..7d8295d 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
@@ -37,7 +37,7 @@ services:
env_file:
- ./docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -48,7 +48,7 @@ services:
- ./docker-config
command: ["ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -59,7 +59,7 @@ services:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["ozone","scm"]
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/.env b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/.env
index 1ec33ae..27fc576 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/.env
@@ -19,4 +19,4 @@ HDDS_VERSION=@hdds.version@
# See: HADOOP-16092 for more details.
HADOOP_IMAGE=flokkr/hadoop
HADOOP_VERSION=2.7.7
-HADOOP_RUNNER_VERSION=@docker.ozone-runner.version@
+OZONE_RUNNER_VERSION=@docker.ozone-runner.version@
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml
index a23566b..17f5ee5 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../../..:/opt/hadoop
ports:
@@ -27,7 +27,7 @@ services:
- docker-config
- ../common-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: om
volumes:
- ../../..:/opt/hadoop
@@ -41,7 +41,7 @@ services:
- ../common-config
command: ["/opt/hadoop/bin/ozone","om"]
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: s3g
volumes:
- ../../..:/opt/hadoop
@@ -52,7 +52,7 @@ services:
- ../common-config
command: ["/opt/hadoop/bin/ozone","s3g"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: scm
volumes:
- ../../..:/opt/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/.env b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/.env
index c6ef057..4cb4271 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/.env
@@ -19,4 +19,4 @@ HDDS_VERSION=@hdds.version@
# See: HADOOP-16092 for more details.
HADOOP_IMAGE=flokkr/hadoop
HADOOP_VERSION=3.1.2
-HADOOP_RUNNER_VERSION=@docker.ozone-runner.version@
+OZONE_RUNNER_VERSION=@docker.ozone-runner.version@
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml
index af1c960..e3696fc 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../../..:/opt/hadoop
ports:
@@ -27,7 +27,7 @@ services:
- docker-config
- ../common-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: om
volumes:
- ../../..:/opt/hadoop
@@ -41,7 +41,7 @@ services:
- ../common-config
command: ["/opt/hadoop/bin/ozone","om"]
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: s3g
volumes:
- ../../..:/opt/hadoop
@@ -52,7 +52,7 @@ services:
- ../common-config
command: ["/opt/hadoop/bin/ozone","s3g"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: scm
volumes:
- ../../..:/opt/hadoop
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 d2c5aad..70ba4b6 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env
@@ -17,4 +17,4 @@
HDDS_VERSION=@hdds.version@
HADOOP_IMAGE=apache/hadoop
HADOOP_VERSION=3
-HADOOP_RUNNER_VERSION=@docker.ozone-runner.version@
+OZONE_RUNNER_VERSION=@docker.ozone-runner.version@
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml
index 755b279..c25d36c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../../..:/opt/hadoop
ports:
@@ -27,7 +27,7 @@ services:
- docker-config
- ../common-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: om
volumes:
- ../../..:/opt/hadoop
@@ -41,7 +41,7 @@ services:
- ../common-config
command: ["/opt/hadoop/bin/ozone","om"]
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: s3g
volumes:
- ../../..:/opt/hadoop
@@ -52,7 +52,7 @@ services:
- ../common-config
command: ["/opt/hadoop/bin/ozone","s3g"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: scm
volumes:
- ../../..:/opt/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
index 116419e..2cd2ce8 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -27,7 +27,7 @@ services:
env_file:
- ./docker-config
om1:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
om2:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -53,7 +53,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
om3:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -66,7 +66,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-recon/.env b/hadoop-ozone/dist/src/main/compose/ozone-recon/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-recon/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-recon/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
index 4cec246..38e2ef3 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -28,7 +28,7 @@ services:
env_file:
- ./docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -52,7 +52,7 @@ services:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["/opt/hadoop/bin/ozone","scm"]
recon:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-topology/.env b/hadoop-ozone/dist/src/main/compose/ozone-topology/.env
index 19a7316..249827b 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=0.5.0-SNAPSHOT
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
index 7b99a7b..a66eff6 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode_1:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -31,7 +31,7 @@ services:
net:
ipv4_address: 10.5.0.4
datanode_2:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -45,7 +45,7 @@ services:
net:
ipv4_address: 10.5.0.5
datanode_3:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -59,7 +59,7 @@ services:
net:
ipv4_address: 10.5.0.6
datanode_4:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -73,7 +73,7 @@ services:
net:
ipv4_address: 10.5.0.7
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -88,7 +88,7 @@ services:
net:
ipv4_address: 10.5.0.70
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/.env b/hadoop-ozone/dist/src/main/compose/ozone/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
index 6bfe36c..145ce3e 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -28,7 +28,7 @@ services:
env_file:
- ./docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
privileged: true #required by the profiler
volumes:
- ../..:/opt/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneblockade/.env b/hadoop-ozone/dist/src/main/compose/ozoneblockade/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
index ac54889..703329f 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -26,7 +26,7 @@ services:
env_file:
- ./docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -37,7 +37,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -48,7 +48,7 @@ services:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["/opt/hadoop/bin/ozone","scm"]
ozone_client:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/.env b/hadoop-ozone/dist/src/main/compose/ozoneperf/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneperf/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
index a13aeaf..fa20540 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -26,7 +26,7 @@ services:
env_file:
- ./docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -37,7 +37,7 @@ services:
- ./docker-config
command: ["ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -61,7 +61,7 @@ services:
ports:
- 9090:9090
freon:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
environment:
@@ -79,7 +79,7 @@ services:
ports:
- 3000:3000
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/.env b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml
index 8297929..78fd996 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml
@@ -24,7 +24,7 @@ services:
ports:
- 9878:9878
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -33,7 +33,7 @@ services:
env_file:
- ./docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -44,7 +44,7 @@ services:
- ./docker-config
command: ["ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -55,7 +55,7 @@ services:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["ozone","scm"]
s3g1:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -64,7 +64,7 @@ services:
- ./docker-config
command: ["ozone","s3g"]
s3g2:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -73,7 +73,7 @@ services:
- ./docker-config
command: ["ozone","s3g"]
s3g3:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/.env b/hadoop-ozone/dist/src/main/compose/ozones3/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozones3/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
index f4b8cc2..cc4bfd2 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
@@ -17,7 +17,7 @@
version: "3"
services:
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -26,7 +26,7 @@ services:
env_file:
- ./docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -37,7 +37,7 @@ services:
- ./docker-config
command: ["ozone","om"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -48,7 +48,7 @@ services:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["ozone","scm"]
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/.env b/hadoop-ozone/dist/src/main/compose/ozonescripts/.env
index 8753b1d..96ab163 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/.env
@@ -15,4 +15,4 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
index c4253fa..37227ac 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
@@ -16,4 +16,4 @@
HDDS_VERSION=${hdds.version}
HADOOP_VERSION=3
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
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 468506c..ec478c0 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
@@ -37,7 +37,7 @@ services:
- ./docker-config
command: ["hadoop", "kms"]
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
networks:
- ozone
volumes:
@@ -48,7 +48,7 @@ services:
env_file:
- docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: om
networks:
- ozone
@@ -62,7 +62,7 @@ services:
- docker-config
command: ["/opt/hadoop/bin/ozone","om"]
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: s3g
networks:
- ozone
@@ -74,7 +74,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","s3g"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: scm
networks:
- ozone
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env
index c4253fa..37227ac 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env
@@ -16,4 +16,4 @@
HDDS_VERSION=${hdds.version}
HADOOP_VERSION=3
-HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
\ No newline at end of file
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
index d202717..de60a41 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -35,7 +35,7 @@ services:
command: ["hadoop", "kms"]
datanode:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
volumes:
- ../..:/opt/hadoop
ports:
@@ -44,7 +44,7 @@ services:
env_file:
- docker-config
om:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: om
volumes:
- ../..:/opt/hadoop
@@ -56,7 +56,7 @@ services:
- docker-config
command: ["/opt/hadoop/bin/ozone","om"]
s3g:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: s3g
volumes:
- ../..:/opt/hadoop
@@ -66,7 +66,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","s3g"]
recon:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: recon
volumes:
- ../..:/opt/hadoop
@@ -78,7 +78,7 @@ services:
WAITFOR: om:9874
command: ["/opt/hadoop/bin/ozone","recon"]
scm:
- image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
+ image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
hostname: scm
volumes:
- ../..:/opt/hadoop
diff --git a/hadoop-ozone/fault-injection-test/network-tests/src/test/blockade/ozone/cluster.py b/hadoop-ozone/fault-injection-test/network-tests/src/test/blockade/ozone/cluster.py
index 1434266..1616083 100644
--- a/hadoop-ozone/fault-injection-test/network-tests/src/test/blockade/ozone/cluster.py
+++ b/hadoop-ozone/fault-injection-test/network-tests/src/test/blockade/ozone/cluster.py
@@ -151,8 +151,8 @@ class OzoneCluster(object):
# check if docker is up.
- if "HADOOP_RUNNER_VERSION" not in os.environ:
- self.__logger__.error("HADOOP_RUNNER_VERSION is not set.")
+ if "OZONE_RUNNER_VERSION" not in os.environ:
+ self.__logger__.error("OZONE_RUNNER_VERSION is not set.")
sys.exit(1)
if "HDDS_VERSION" not in os.environ:
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org