Standardize test results directory between normal/docker tests (#8718)

Normalize the test results location between docker and non docker tests
broadinstitute · Mar 7, 2024 · a2ebb37 · a2ebb37
1 parent c97faf6
commit a2ebb37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/actions/upload-gatk-test-results/action.yml b/.github/actions/upload-gatk-test-results/action.yml
@@ -49,7 +49,7 @@ runs:
       id: uploadreports
       run: |
         gsutil -m cp -z html -z js -z xml -z css -r build/reports/tests gs:/${{ env.HELLBENDER_TEST_LOGS }}${{ inputs.repo-path }}/;
-        VIEW_URL=https://storage.googleapis.com${{ env.HELLBENDER_TEST_LOGS }}${{ inputs.repo-path }}/tests/testOnPackagedReleaseJar/index.html
+        VIEW_URL=https://storage.googleapis.com${{ env.HELLBENDER_TEST_LOGS }}${{ inputs.repo-path }}/tests/test/index.html
         echo "See the test report at ${VIEW_URL}";
         echo view_url="${VIEW_URL}" >> $GITHUB_OUTPUT
 

diff --git a/.github/workflows/gatk-tests.yml b/.github/workflows/gatk-tests.yml
@@ -230,10 +230,6 @@ jobs:
             bash --init-file /gatk/gatkenv.rc /root/run_unit_tests.sh;
           TEST_EXIT_VALUE=$?;
           $( exit ${TEST_EXIT_VALUE} );
-          sudo chmod -R a+w build/reports/;
-          mkdir build/reports/tests/test \
-           && cp -rp build/reports/tests/testOnPackagedReleaseJar/* build/reports/tests/test \
-           && rm -r build/reports/tests/testOnPackagedReleaseJar;
 
       - uses: ./.github/actions/upload-gatk-test-results
         if: always()

diff --git a/scripts/docker/dockertest.gradle b/scripts/docker/dockertest.gradle
@@ -144,6 +144,9 @@ task testOnPackagedReleaseJar(type: Test){
 
     jvmArgs = getJVMArgs(runtimeAddOpens, testAddOpens)
 
+    //Set this to match the name of the normal test output in order to simplify finding / uploading it
+    reports.html.outputLocation = file("$buildDir/reports/tests/test")
+
     classpath = files( gatkJar, testDependencyJar, testClassesJar)
     testClassesDirs = files(testClassesUnpacked)
 }