Skip to content

HDDS-2216. Rename HADOOP_RUNNER_VERSION to OZONE_RUNNER_VERSION in co… #1570

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

Closed
cxorm wants to merge 1 commit into from
Closed

HDDS-2216. Rename HADOOP_RUNNER_VERSION to OZONE_RUNNER_VERSION in co… #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/dev-support/checks/blockade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.

HADOOP_VERSION=3
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
6 changes: 3 additions & 3 deletions hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ [email protected]@
# See: HADOOP-16092 for more details.
HADOOP_IMAGE=flokkr/hadoop
HADOOP_VERSION=2.7.7
HADOOP_RUNNER_VERSION[email protected]@
OZONE_RUNNER_VERSION[email protected]@
8 changes: 4 additions & 4 deletions hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ [email protected]@
# See: HADOOP-16092 for more details.
HADOOP_IMAGE=flokkr/hadoop
HADOOP_VERSION=3.1.2
HADOOP_RUNNER_VERSION[email protected]@
OZONE_RUNNER_VERSION[email protected]@
8 changes: 4 additions & 4 deletions hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
[email protected]@
HADOOP_IMAGE=apache/hadoop
HADOOP_VERSION=3
HADOOP_RUNNER_VERSION[email protected]@
OZONE_RUNNER_VERSION[email protected]@
8 changes: 4 additions & 4 deletions hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
10 changes: 5 additions & 5 deletions hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-recon/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
8 changes: 4 additions & 4 deletions hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-topology/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.

HDDS_VERSION=0.5.0-SNAPSHOT
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
12 changes: 6 additions & 6 deletions hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
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,4 +15,4 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
6 changes: 3 additions & 3 deletions hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozoneblockade/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
Loading