HDDS-2216. Rename HADOOP_RUNNER_VERSION to OZONE_RUNNER_VERSION in compose .env files.

Closes #1570.

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

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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:

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@

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

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@

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

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@

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

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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:

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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:

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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:

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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:

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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

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}
+OZONE_RUNNER_VERSION=${docker.ozone-runner.version}

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

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: