From 55eeca5ba64af5608e8bcedb6c58d0cc2b4b76c8 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 20 Nov 2024 15:01:06 +0100 Subject: [PATCH] HDDS-11758. Require successful quick checks for repro --- .github/workflows/ci.yml | 6 ++--- dev-support/ci/selective_ci_checks.bats | 36 +------------------------ dev-support/ci/selective_ci_checks.sh | 29 +++----------------- 3 files changed, 7 insertions(+), 64 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf180b15001..14dc70ae086 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,6 @@ jobs: needs-build: ${{ steps.selective-checks.outputs.needs-build }} needs-compile: ${{ steps.selective-checks.outputs.needs-compile }} needs-compose-tests: ${{ steps.selective-checks.outputs.needs-compose-tests }} - needs-dependency-check: ${{ steps.selective-checks.outputs.needs-dependency-check }} needs-integration-tests: ${{ steps.selective-checks.outputs.needs-integration-tests }} needs-kubernetes-tests: ${{ steps.selective-checks.outputs.needs-kubernetes-tests }} sha: ${{ steps.get-sha.outputs.sha }} @@ -339,7 +338,6 @@ jobs: - build runs-on: ubuntu-20.04 timeout-minutes: 5 - if: needs.build-info.outputs.needs-dependency-check == 'true' steps: - name: Checkout project uses: actions/checkout@v4 @@ -370,7 +368,6 @@ jobs: - build runs-on: ubuntu-20.04 timeout-minutes: 15 - if: needs.build-info.outputs.needs-dependency-check == 'true' steps: - name: Checkout project uses: actions/checkout@v4 @@ -415,6 +412,9 @@ jobs: needs: - build-info - build + - basic + - dependency + - license runs-on: ubuntu-20.04 timeout-minutes: 30 steps: diff --git a/dev-support/ci/selective_ci_checks.bats b/dev-support/ci/selective_ci_checks.bats index 6edd38d68fe..e1a9f90807f 100644 --- a/dev-support/ci/selective_ci_checks.bats +++ b/dev-support/ci/selective_ci_checks.bats @@ -40,7 +40,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -52,7 +51,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=false assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -64,7 +62,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -76,7 +73,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=false assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=true } @@ -88,7 +84,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=true } @@ -100,7 +95,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=false assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=true } @@ -112,7 +106,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=false } @@ -124,7 +117,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=false } @@ -136,7 +128,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=false } @@ -148,7 +139,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=false } @@ -160,7 +150,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=false } @@ -172,7 +161,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=false } @@ -184,7 +172,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -196,7 +183,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -208,7 +194,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=true } @@ -220,7 +205,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -232,7 +216,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -244,7 +227,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -256,7 +238,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -268,7 +249,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -280,7 +260,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -292,7 +271,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -304,7 +282,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -317,7 +294,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -329,7 +305,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=true assert_output -p needs-compose-tests=true - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=true } @@ -341,7 +316,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -353,7 +327,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -365,7 +338,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -377,7 +349,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -389,7 +360,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -401,7 +371,6 @@ load bats-assert/load.bash assert_output -p needs-build=true assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -413,7 +382,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -422,10 +390,9 @@ load bats-assert/load.bash run dev-support/ci/selective_ci_checks.sh 47a5671cc5 assert_output -p 'basic-checks=["rat","bats"]' - assert_output -p needs-build=false + assert_output -p needs-build=true assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=true assert_output -p needs-integration-tests=false assert_output -p needs-kubernetes-tests=false } @@ -437,7 +404,6 @@ load bats-assert/load.bash assert_output -p needs-build=false assert_output -p needs-compile=false assert_output -p needs-compose-tests=false - assert_output -p needs-dependency-check=false assert_output -p needs-integration-tests=true assert_output -p needs-kubernetes-tests=false } diff --git a/dev-support/ci/selective_ci_checks.sh b/dev-support/ci/selective_ci_checks.sh index 869d36fc6cc..2ff8cbc2d7d 100755 --- a/dev-support/ci/selective_ci_checks.sh +++ b/dev-support/ci/selective_ci_checks.sh @@ -87,7 +87,6 @@ function set_outputs_run_everything_and_exit() { | cut -f1 -d'.') compile_needed=true compose_tests_needed=true - dependency_check_needed=true integration_tests_needed=true kubernetes_tests_needed=true @@ -99,7 +98,6 @@ function set_outputs_run_everything_and_exit() { function set_output_skip_all_tests_and_exit() { BASIC_CHECKS="" compose_tests_needed=false - dependency_check_needed=false integration_tests_needed=false kubernetes_tests_needed=false @@ -306,6 +304,9 @@ function check_needs_build() { start_end::group_start "Check if build is needed" local pattern_array=( "^hadoop-ozone/dev-support/checks/build.sh" + "^hadoop-ozone/dev-support/checks/dependency.sh" + "^hadoop-ozone/dist/src/main/license/update-jar-report.sh" + "^hadoop-ozone/dist/src/main/license/jar-report.txt" "src/main/java" "src/main/resources" ) @@ -330,7 +331,6 @@ function check_needs_compile() { if [[ ${match_count} != "0" ]]; then compile_needed=true - dependency_check_needed=true fi start_end::group_end @@ -394,24 +394,6 @@ function check_needs_docs() { fi } -function check_needs_dependency() { - start_end::group_start "Check if dependency is needed" - local pattern_array=( - "^hadoop-ozone/dev-support/checks/dependency.sh" - "^hadoop-ozone/dist/src/main/license/update-jar-report.sh" - "^hadoop-ozone/dist/src/main/license/jar-report.txt" - "pom.xml" - ) - filter_changed_files - - dependency_check_needed=false - if [[ ${match_count} != "0" ]]; then - dependency_check_needed=true - fi - - start_end::group_end -} - function check_needs_findbugs() { start_end::group_start "Check if findbugs is needed" local pattern_array=( @@ -521,7 +503,6 @@ function calculate_test_types_to_run() { echo "Looks like ${COUNT_CORE_OTHER_CHANGED_FILES} core files changed, running all tests." echo compose_tests_needed=true - dependency_check_needed=true integration_tests_needed=true kubernetes_tests_needed=true else @@ -529,14 +510,12 @@ function calculate_test_types_to_run() { echo if [[ ${COUNT_COMPOSE_CHANGED_FILES} != "0" ]] || [[ ${COUNT_ROBOT_CHANGED_FILES} != "0" ]]; then compose_tests_needed="true" - dependency_check_needed=true fi if [[ ${COUNT_INTEGRATION_CHANGED_FILES} != "0" ]]; then integration_tests_needed="true" fi if [[ ${COUNT_KUBERNETES_CHANGED_FILES} != "0" ]] || [[ ${COUNT_ROBOT_CHANGED_FILES} != "0" ]]; then kubernetes_tests_needed="true" - dependency_check_needed=true fi fi start_end::group_end @@ -557,7 +536,6 @@ function set_outputs() { initialization::ga_output needs-build "${build_needed:-false}" initialization::ga_output needs-compile "${compile_needed}" initialization::ga_output needs-compose-tests "${compose_tests_needed}" - initialization::ga_output needs-dependency-check "${dependency_check_needed}" initialization::ga_output needs-integration-tests "${integration_tests_needed}" initialization::ga_output needs-kubernetes-tests "${kubernetes_tests_needed}" } @@ -594,7 +572,6 @@ get_count_robot_files get_count_misc_files check_needs_build -check_needs_dependency check_needs_compile # calculate basic checks to run