This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch HDDS-3757 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 50442081cf95df69dfe7c2dde0fa5ec268b1086b Author: Elek Márton <[email protected]> AuthorDate: Fri Jun 5 14:02:32 2020 +0200 acceptance-coverage --- .github/workflows/post-commit.yml | 43 ++++++++++++---------- hadoop-ozone/dev-support/checks/acceptance.sh | 18 ++++++++- hadoop-ozone/dev-support/checks/build.sh | 2 +- hadoop-ozone/dist/pom.xml | 42 +++++++++++++++++++++ .../src/main/compose/ozone-csi/docker-compose.yaml | 6 +++ .../compose/ozone-mr/hadoop31/docker-compose.yaml | 6 +++ .../compose/ozone-mr/hadoop32/docker-compose.yaml | 4 ++ .../compose/ozone-om-ha-s3/docker-compose.yaml | 8 ++++ .../compose/ozone-topology/docker-compose.yaml | 14 +++++++ .../src/main/compose/ozone/docker-compose.yaml | 5 +++ .../compose/ozonesecure-mr/docker-compose.yaml | 4 ++ .../compose/ozonesecure-om-ha/docker-compose.yaml | 13 +++++-- .../main/compose/ozonesecure/docker-compose.yaml | 5 +++ hadoop-ozone/dist/src/main/compose/test-all.sh | 2 +- hadoop-ozone/dist/src/main/compose/testlib.sh | 2 + 15 files changed, 147 insertions(+), 27 deletions(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index fc2dda1..2e5d180 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -93,25 +93,30 @@ jobs: name: acceptance runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@master - - uses: ./.github/buildenv - with: - args: ./hadoop-ozone/dev-support/checks/build.sh - # remove image created for 'buildenv' - - run: docker image rm $(docker images -a -q | head -1) || true - # remove its big parent build image - - run: docker image rm apache/ozone-build || true - - run: sudo pip install robotframework - - run: sudo mv ./hadoop-ozone/dist/target/ozone-* /mnt/ozone && sudo chown runner -R /mnt/ozone - - run: cd /mnt/ozone && mkdir .aws && sudo chown 1000 .aws - - run: cd /mnt/ozone/compose && ./test-all.sh - env: - KEEP_IMAGE: false - - uses: actions/upload-artifact@master - if: always() - with: - name: acceptance - path: /mnt/ozone/compose/result + - uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: maven-repo-${{ hashFiles('**/pom.xml') }} + - run: | + sudo chmod 777 /mnt + git clone https://github.com/${GITHUB_REPOSITORY}.git /mnt/ozone + cd /mnt/ozone + git checkout ${GITHUB_SHA} + git reset --hard + - run: sudo pip install robotframework + - run: cd /mnt/ozone && hadoop-ozone/dev-support/checks/acceptance.sh + env: + KEEP_IMAGE: false + - uses: actions/upload-artifact@master + if: always() + with: + name: acceptance + path: /mnt/ozone/target/acceptance + - run: | + #Never cache local artifacts + rm -rf ~/.m2/repository/org/apache/hadoop/hdds + rm -rf ~/.m2/repository/org/apache/hadoop/ozone + if: always() it-freon: name: it-freon runs-on: ubuntu-18.04 diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh b/hadoop-ozone/dev-support/checks/acceptance.sh index c3c1aa0..ea9f36d 100755 --- a/hadoop-ozone/dev-support/checks/acceptance.sh +++ b/hadoop-ozone/dev-support/checks/acceptance.sh @@ -17,19 +17,33 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/acceptance"} -mkdir -p "$REPORT_DIR" OZONE_VERSION=$(grep "<ozone.version>" "pom.xml" | sed 's/<[^>]*>//g'| sed 's/^[ \t]*//') DIST_DIR="$DIR/../../dist/target/ozone-$OZONE_VERSION" if [ ! -d "$DIST_DIR" ]; then echo "Distribution dir is missing. Doing a full build" - "$DIR/build.sh" + "$DIR/build.sh" -Pjacoco fi +mkdir -p "$REPORT_DIR" + +export HADOOP_OPTS='-javaagent:/opt/hadoop/share/jacoco/jacoco-agent.jar=destfile=/tmp/jacoco.exec,includes=org.apache.hadoop.ozone.*:org.apache.hadoop.hdds' + cd "$DIST_DIR/compose" || exit 1 ./test-all.sh RES=$? cp result/* "$REPORT_DIR/" cp "$REPORT_DIR/log.html" "$REPORT_DIR/summary.html" +set -x + +EXEC_FILES=$(find "$REPORT_DIR" -name "*.jacoco.exec" | wc -l) +if [[ $EXEC_FILES -gt 1 ]]; then + java -jar "$DIST_DIR/share/jacoco/jacoco-cli.jar" merge $(find "$REPORT_DIR" -name "*.jacoco.exec") --destdir "$REPORT_DIR/jacoco-combined.exec" +fi + +if [[ $EXEC_FILES == 1 ]]; then + cp "$REPORT_DIR"/*.jacoco.exec "$REPORT_DIR/jacoco-combined.exec" +fi + exit $RES diff --git a/hadoop-ozone/dev-support/checks/build.sh b/hadoop-ozone/dev-support/checks/build.sh index f461da1..2cdc4fe 100755 --- a/hadoop-ozone/dev-support/checks/build.sh +++ b/hadoop-ozone/dev-support/checks/build.sh @@ -17,5 +17,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 export MAVEN_OPTS="-Xmx4096m" -mvn -B -Dmaven.javadoc.skip=true -DskipTests clean install +mvn -B -Dmaven.javadoc.skip=true -DskipTests clean install "$@" exit $? diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index 0929b24..0487b75 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -379,7 +379,49 @@ <artifactId>hadoop-ozone-recon</artifactId> </dependency> </dependencies> + </profile> + <profile> + <id>jacoco</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.1.1</version> + <executions> + <execution> + <id>copy-jacoco-files</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory> + target/ozone-${ozone.version}/share/jacoco + </outputDirectory> + <artifactItems> + <artifactItem> + <groupId>org.jacoco</groupId> + <artifactId>org.jacoco.agent</artifactId> + <version>0.8.5</version> + <classifier>runtime</classifier> + <destFileName>jacoco-agent.jar</destFileName> + </artifactItem> + <artifactItem> + <groupId>org.jacoco</groupId> + <artifactId>org.jacoco.cli</artifactId> + <version>0.8.5</version> + <classifier>nodeps</classifier> + <destFileName>jacoco-cli.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> <profile> diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml index e175dfa..1fd7ebd 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml @@ -23,6 +23,8 @@ services: - ../..:/opt/hadoop env_file: - docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} ports: - 9864 - 9882 @@ -35,6 +37,7 @@ services: - docker-config environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} ports: - 9874:9874 - 9862:9862 @@ -49,6 +52,7 @@ services: - 9876:9876 environment: ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} command: ["ozone","scm"] csi: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} @@ -56,4 +60,6 @@ services: - ../..:/opt/hadoop env_file: - docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} command: ["ozone","csi"] 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 351e1e9..dc7261f 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 @@ -26,6 +26,8 @@ services: env_file: - docker-config - ../common-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} om: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} hostname: om @@ -37,6 +39,7 @@ services: environment: WAITFOR: scm:9876 ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - docker-config - ../common-config @@ -51,6 +54,8 @@ services: env_file: - ./docker-config - ../common-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","s3g"] scm: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} @@ -65,6 +70,7 @@ services: environment: ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}" + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] rm: image: ${HADOOP_IMAGE}:${HADOOP_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 35303cb..89c4f7a 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 @@ -37,6 +37,7 @@ services: environment: WAITFOR: scm:9876 ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - docker-config - ../common-config @@ -51,6 +52,8 @@ services: env_file: - ./docker-config - ../common-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","s3g"] scm: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} @@ -65,6 +68,7 @@ services: environment: ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}" + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] rm: image: ${HADOOP_IMAGE}:${HADOOP_VERSION} diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml index ff7f260..2359482 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml @@ -26,6 +26,8 @@ services: command: ["/opt/hadoop/bin/ozone","datanode"] env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} om1: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} privileged: true #required by the profiler @@ -36,6 +38,7 @@ services: - 9890:9872 environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -49,6 +52,7 @@ services: - 9892:9872 environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -62,6 +66,7 @@ services: - 9894:9872 environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -77,6 +82,7 @@ services: environment: ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}" + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] s3g: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} @@ -86,5 +92,7 @@ services: - 9878:9878 env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} command: ["ozone","s3g"] 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 7086c3f..e9d94ea 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 @@ -27,6 +27,8 @@ services: command: ["/opt/hadoop/bin/ozone","datanode"] env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} networks: net: ipv4_address: 10.5.0.4 @@ -41,6 +43,8 @@ services: command: ["/opt/hadoop/bin/ozone","datanode"] env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} networks: net: ipv4_address: 10.5.0.5 @@ -55,6 +59,8 @@ services: command: ["/opt/hadoop/bin/ozone","datanode"] env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} networks: net: ipv4_address: 10.5.0.6 @@ -69,6 +75,8 @@ services: command: ["/opt/hadoop/bin/ozone","datanode"] env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} networks: net: ipv4_address: 10.5.0.7 @@ -83,6 +91,8 @@ services: command: ["/opt/hadoop/bin/ozone","datanode"] env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} networks: net: ipv4_address: 10.5.0.8 @@ -97,6 +107,8 @@ services: command: ["/opt/hadoop/bin/ozone","datanode"] env_file: - ./docker-config + environment: + HADOOP_OPTS: ${HADOOP_OPTS} networks: net: ipv4_address: 10.5.0.9 @@ -110,6 +122,7 @@ services: - 9862:9862 environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -128,6 +141,7 @@ services: environment: ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-6}" + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] networks: net: 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 869aa05..2597612 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml @@ -37,11 +37,13 @@ services: - 9882 environment: <<: *replication + HADOOP_OPTS: ${HADOOP_OPTS} command: ["ozone","datanode"] om: <<: *common-config environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION + HADOOP_OPTS: ${HADOOP_OPTS} <<: *replication ports: - 9874:9874 @@ -54,11 +56,13 @@ services: environment: ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1} + HADOOP_OPTS: ${HADOOP_OPTS} <<: *replication command: ["ozone","scm"] s3g: <<: *common-config environment: + HADOOP_OPTS: ${HADOOP_OPTS} <<: *replication ports: - 9878:9878 @@ -68,5 +72,6 @@ services: ports: - 9888:9888 environment: + HADOOP_OPTS: ${HADOOP_OPTS} <<: *replication command: ["ozone","recon"] 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 e6d5a77..d9cbb34 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 @@ -48,6 +48,7 @@ services: - docker-config environment: KERBEROS_KEYTABS: dn HTTP + HADOOP_OPTS: ${HADOOP_OPTS} om: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} hostname: om @@ -61,6 +62,7 @@ services: environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION KERBEROS_KEYTABS: om HTTP testuser + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -77,6 +79,7 @@ services: - ./docker-config environment: KERBEROS_KEYTABS: s3g HTTP + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","s3g"] scm: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} @@ -93,6 +96,7 @@ services: ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}" KERBEROS_KEYTABS: scm HTTP + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] rm: image: apache/hadoop:${HADOOP_VERSION} diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml index ba0bd19..5c7f156 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml @@ -48,6 +48,7 @@ services: - docker-config environment: KERBEROS_KEYTABS: dn HTTP + HADOOP_OPTS: ${HADOOP_OPTS} networks: ozone_net: ipv4_address: 172.25.0.102 @@ -62,6 +63,7 @@ services: - docker-config environment: KERBEROS_KEYTABS: dn HTTP + HADOOP_OPTS: ${HADOOP_OPTS} networks: ozone_net: ipv4_address: 172.25.0.103 @@ -76,6 +78,7 @@ services: - docker-config environment: KERBEROS_KEYTABS: dn HTTP + HADOOP_OPTS: ${HADOOP_OPTS} networks: ozone_net: ipv4_address: 172.25.0.104 @@ -91,7 +94,7 @@ services: environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION KERBEROS_KEYTABS: om HTTP - #HADOOP_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:18001" + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -110,7 +113,7 @@ services: environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION KERBEROS_KEYTABS: om HTTP - #HADOOP_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:18002" + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -129,7 +132,7 @@ services: environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION KERBEROS_KEYTABS: om HTTP - #HADOOP_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:18003" + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -148,6 +151,7 @@ services: command: ["/opt/hadoop/bin/ozone","s3g"] environment: KERBEROS_KEYTABS: s3g HTTP testuser + HADOOP_OPTS: ${HADOOP_OPTS} networks: ozone_net: ipv4_address: 172.25.0.114 @@ -163,7 +167,7 @@ services: - ./docker-config environment: KERBEROS_KEYTABS: recon HTTP - #HADOOP_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:18000" + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","recon"] extra_hosts: - "om1: 172.25.0.111" @@ -185,6 +189,7 @@ services: KERBEROS_KEYTABS: scm HTTP testuser testuser2 ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-3}" + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] extra_hosts: - "om1: 172.25.0.111" 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 18d5848..6c67d1e 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml @@ -43,6 +43,7 @@ services: - docker-config environment: KERBEROS_KEYTABS: dn HTTP + HADOOP_OPTS: ${HADOOP_OPTS} om: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} hostname: om @@ -54,6 +55,7 @@ services: environment: ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION KERBEROS_KEYTABS: om HTTP + HADOOP_OPTS: ${HADOOP_OPTS} env_file: - docker-config command: ["/opt/hadoop/bin/ozone","om"] @@ -70,6 +72,7 @@ services: command: ["/opt/hadoop/bin/ozone","s3g"] environment: KERBEROS_KEYTABS: s3g HTTP testuser + HADOOP_OPTS: ${HADOOP_OPTS} recon: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} hostname: recon @@ -81,6 +84,7 @@ services: - ./docker-config environment: KERBEROS_KEYTABS: recon HTTP + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","recon"] scm: image: apache/ozone-runner:${OZONE_RUNNER_VERSION} @@ -95,4 +99,5 @@ services: KERBEROS_KEYTABS: scm HTTP testuser testuser2 ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}" + HADOOP_OPTS: ${HADOOP_OPTS} command: ["/opt/hadoop/bin/ozone","scm"] diff --git a/hadoop-ozone/dist/src/main/compose/test-all.sh b/hadoop-ozone/dist/src/main/compose/test-all.sh index 809123b..a84abb2 100755 --- a/hadoop-ozone/dist/src/main/compose/test-all.sh +++ b/hadoop-ozone/dist/src/main/compose/test-all.sh @@ -41,7 +41,7 @@ for test in $(find "$SCRIPT_DIR" -name test.sh | sort); do echo "ERROR: Test execution of $(dirname "$test") is FAILED!!!!" fi RESULT_DIR="$(dirname "$test")/result" - cp "$RESULT_DIR"/robot-*.xml "$RESULT_DIR"/docker-*.log "$RESULT_DIR"/*.out* "$ALL_RESULT_DIR"/ + cp "$RESULT_DIR"/robot-*.xml "$RESULT_DIR"/docker-*.log "$RESULT_DIR"/*.out* "$RESULT_DIR"/*.exec "$ALL_RESULT_DIR"/ done rebot -N "smoketests" -d "$SCRIPT_DIR/result" "$SCRIPT_DIR/result/robot-*.xml" diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh old mode 100755 new mode 100644 index 064b19d..5948ac9 --- a/hadoop-ozone/dist/src/main/compose/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/testlib.sh @@ -108,7 +108,9 @@ execute_robot_test(){ local -i rc=$? FULL_CONTAINER_NAME=$(docker-compose -f "$COMPOSE_FILE" ps | grep "_${CONTAINER}_" | head -n 1 | awk '{print $1}') + docker cp "$FULL_CONTAINER_NAME:$OUTPUT_PATH" "$RESULT_DIR/" + docker cp "$FULL_CONTAINER_NAME:/tmp/jacoco.exec" "$RESULT_DIR/$OUTPUT_NAME.jacoco.exec" || true copy_daemon_logs --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
