This is an automated email from the ASF dual-hosted git repository. yihua pushed a commit to branch branch-0.x in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 055df60db80f49f4333abd16ac9d48f9e89bf62b Author: Danny Chan <[email protected]> AuthorDate: Mon Apr 29 12:21:00 2024 +0800 [HUDI-7682] Remove the files copy in Azure CI tests report (#11110) --- azure-pipelines-20230430.yml | 26 +++++------------ scripts/ci/move_surefire_reports.sh | 58 ------------------------------------- 2 files changed, 8 insertions(+), 76 deletions(-) diff --git a/azure-pipelines-20230430.yml b/azure-pipelines-20230430.yml index e61057a4649..de9876dbd87 100644 --- a/azure-pipelines-20230430.yml +++ b/azure-pipelines-20230430.yml @@ -287,23 +287,18 @@ stages: arguments: > -v $(Build.SourcesDirectory):/hudi -i docker.io/apachehudi/hudi-ci-bundle-validation-base:$(Build.BuildId) - /bin/bash -c "pwd - && rm -rf /hudi/scripts/ci/results - && mvn clean install $(MVN_OPTS_INSTALL) -Phudi-platform-service -Pthrift-gen-source -pl hudi-utilities -am + /bin/bash -c "mvn clean install $(MVN_OPTS_INSTALL) -Phudi-platform-service -Pthrift-gen-source -pl hudi-utilities -am && mvn test $(MVN_OPTS_TEST) -Punit-tests -Dtest="Test*DeltaStreamer*" -DfailIfNoTests=false -pl hudi-utilities - && mvn test $(MVN_OPTS_TEST) -Pfunctional-tests -Dtest="Test*DeltaStreamer*" -DfailIfNoTests=false -pl hudi-utilities - && ./scripts/ci/move_surefire_reports.sh /hudi /hudi/scripts/ci/results - && echo 'All surefire report files:' - && find . -type f -name \"TEST-*.xml\"" + && mvn test $(MVN_OPTS_TEST) -Pfunctional-tests -Dtest="Test*DeltaStreamer*" -DfailIfNoTests=false -pl hudi-utilities" - task: PublishTestResults@2 displayName: 'Publish Test Results' inputs: testResultsFormat: 'JUnit' testResultsFiles: '**/surefire-reports/TEST-*.xml' - searchFolder: '$(Build.SourcesDirectory)/scripts/ci/results' + searchFolder: '$(Build.SourcesDirectory)' failTaskOnFailedTests: true - script: | - grep "testcase" scripts/ci/results/*/target/surefire-reports/*.xml scripts/ci/results/*/*/target/surefire-reports/*.xml | awk -F'"' ' { print $6,$4,$2 } ' | sort -nr | head -n 100 + grep "testcase" */target/surefire-reports/*.xml */*/target/surefire-reports/*.xml | awk -F'"' ' { print $6,$4,$2 } ' | sort -nr | head -n 100 displayName: Top 100 long-running testcases - job: UT_FT_6 displayName: UT FT other modules @@ -331,22 +326,17 @@ stages: arguments: > -v $(Build.SourcesDirectory):/hudi -i docker.io/apachehudi/hudi-ci-bundle-validation-base:$(Build.BuildId) - /bin/bash -c "pwd - && rm -rf /hudi/scripts/ci/results - && mvn clean install $(MVN_OPTS_INSTALL) -Phudi-platform-service -Pthrift-gen-source + /bin/bash -c "mvn clean install $(MVN_OPTS_INSTALL) -Phudi-platform-service -Pthrift-gen-source && mvn test $(MVN_OPTS_TEST) -Punit-tests $(SCALA_MVN_TEST_FILTER) -DwildcardSuites="$(JOB6_SPARK_PROCEDURE_WILDCARD_SUITES)" -pl $(JOB34_MODULES) && mvn test $(MVN_OPTS_TEST) -Punit-tests -Dtest="!Test*DeltaStreamer*" -DfailIfNoTests=false -pl $(JOB6_UT_MODULES) - && mvn test $(MVN_OPTS_TEST) -Pfunctional-tests -Dtest="!Test*DeltaStreamer*" -DfailIfNoTests=false -pl $(JOB6_FT_MODULES) - && ./scripts/ci/move_surefire_reports.sh /hudi /hudi/scripts/ci/results - && echo 'All surefire report files:' - && find . -type f -name \"TEST-*.xml\"" + && mvn test $(MVN_OPTS_TEST) -Pfunctional-tests -Dtest="!Test*DeltaStreamer*" -DfailIfNoTests=false -pl $(JOB6_FT_MODULES)" - task: PublishTestResults@2 displayName: 'Publish Test Results' inputs: testResultsFormat: 'JUnit' testResultsFiles: '**/surefire-reports/TEST-*.xml' - searchFolder: '$(Build.SourcesDirectory)/scripts/ci/results' + searchFolder: '$(Build.SourcesDirectory)' failTaskOnFailedTests: true - script: | - grep "testcase" scripts/ci/results/*/target/surefire-reports/*.xml scripts/ci/results/*/*/target/surefire-reports/*.xml | awk -F'"' ' { print $6,$4,$2 } ' | sort -nr | head -n 100 + grep "testcase" */target/surefire-reports/*.xml */*/target/surefire-reports/*.xml | awk -F'"' ' { print $6,$4,$2 } ' | sort -nr | head -n 100 displayName: Top 100 long-running testcases diff --git a/scripts/ci/move_surefire_reports.sh b/scripts/ci/move_surefire_reports.sh deleted file mode 100755 index a4b9b2869bd..00000000000 --- a/scripts/ci/move_surefire_reports.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Check if two arguments were provided -if [ "$#" -ne 2 ]; then - echo "Usage: $0 <source_directory> <destination_directory>" - exit 1 -fi - -# Assign the first and second argument to SOURCE and DEST variables -SOURCE="$1" -DEST="$2" - -# Ensure the source directory exists -if [ ! -d "$SOURCE" ]; then - echo "Source directory does not exist: $SOURCE" - exit 1 -fi - -# Create the destination directory if it doesn't exist -if [ ! -d "$DEST" ]; then - mkdir -p "$DEST" -fi - -find "$SOURCE" -type f -name "TEST-*.xml" | while IFS= read -r file; do - # Extract the relative directory path - relative_path="${file#$SOURCE}" - destination_path="$DEST$relative_path" - destination_dir=$(dirname "$destination_path") - - if [[ "$relative_path" == *"scripts/ci"* ]]; then - continue # Skip this file - fi - - # Create the destination directory if it doesn't exist - mkdir -p "$destination_dir" - - # Move the file to the new location, preserving the directory structure - mv "$file" "$destination_path" -done
