Hyrax-2190: Upload test logs for Docker

.travis.yml

@@ -136,6 +136,7 @@ stages:
 
 jobs:
   include:
+    # build-and-test
     - stage: build-and-test
       name: "check"
       script:
@@ -147,6 +148,7 @@ jobs:
         - echo "LD_LIBRARY_PATH - $LD_LIBRARY_PATH" >&2
         - make -j16 && make install && besctl start -d cerr,curl,http && make check -j16 && besctl stop
 
+    # build-and-test
     - stage: build-and-test
       name: "distcheck"
       script:
@@ -155,6 +157,7 @@ jobs:
         - ./configure $CONFIGURE_OPTIONS --disable-dependency-tracking --prefix=$prefix --with-dependencies=$prefix/deps --enable-developer
         - make distcheck -j16 GZIP_ENV=--fast
 
+    # build-and-test
     - stage: build-and-test
       name: "dist"
       script:
@@ -185,6 +188,11 @@ jobs:
           export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}:snapshot-${DIST}"
           export BES_REPO_DIR=${TRAVIS_BUILD_DIR}
         - ./travis/build-rhel-docker.sh
+        # Note: Take the test log tarball that was created in the Dockerfile and copied to the final mount
+        #   and then run this copy command to copy it into Travis.
+        - |
+          docker run --rm -v /tmp:/scratch ${SNAPSHOT_IMAGE_TAG} \
+          -c "cp /bes-test-logs/bes-test-logs.tar.gz /scratch/bes-autotest-${TRAVIS_JOB_NUMBER}-logs.tar.gz"
         # Note: We need downstream access to the environment variable
         # `BUILD_VERSION_TAG` that can only be determined AFTER the image
         # is built:
@@ -215,6 +223,11 @@ jobs:
           export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}:snapshot-${DIST}"
           export BES_REPO_DIR=${TRAVIS_BUILD_DIR}
         - ./travis/build-rhel-docker.sh
+          # Note: Take the test log tarball that was created in the Dockerfile and copied to the final mount
+          #   and then run this copy command to copy it into Travis.
+        - |
+          docker run --rm -v /tmp:/scratch ${SNAPSHOT_IMAGE_TAG} \
+          -c "cp /bes-test-logs/bes-test-logs.tar.gz /scratch/bes-autotest-${TRAVIS_JOB_NUMBER}-logs.tar.gz"
         # Note: We need downstream access to the environment variable
         # `BUILD_VERSION_TAG` that can only be determined AFTER the image
         # is built:

Dockerfile

@@ -115,6 +115,14 @@ RUN sudo -s --preserve-env=PATH besctl stop
 
 RUN cat libdap4-snapshot | cut -d ' ' -f 1 | sed 's/libdap4-//' > libdap_VERSION
 
+# Copy test logs to a known location for extraction after build
+RUN sudo mkdir -p /home/bes_user/bes-test-logs && \
+    sudo chown $BES_USER:$BES_USER /home/bes_user/bes-test-logs && \
+    echo "Bundling test logs and site_maps:" && \
+    find . \( -name "*.log" -o -name "*site_map.txt" \) -print > /tmp/bes-log-file-list.txt && \
+    tar -czf /home/bes_user/bes-test-logs/bes-test-logs.tar.gz -T /tmp/bes-log-file-list.txt
+
+
 #####
 ##### Final layer: libdap + hyrax-dependencies + bes
 #####
@@ -126,6 +134,9 @@ RUN if [ -z "$FINAL_BASE_IMAGE" ]; then \
         exit 1; \
     fi
 
+# Copy the log files so tha t they can be accessed from outside of this docker build (i.e. Travis)
+COPY --from=builder /home/bes_user/bes-test-logs/bes-test-logs.tar.gz /bes-test-logs/bes-test-logs.tar.gz
+
 # Duplicated from installation above, this time on a slimmer base image...
 # Install the libdap rpms
 ARG LIBDAP_RPM_FILENAME

travis/upload-test-results.sh

@@ -3,16 +3,22 @@
 # Upload the results of tests after running a build on Travis
 
 LOG_FILE_TGZ=bes-autotest-${TRAVIS_JOB_NUMBER}-logs.tar.gz
+S3_BUCKET="s3://opendap.travis.tests"
+
 if test "$BES_BUILD" = main -o "$BES_BUILD" = distcheck -o "$BES_BUILD" = "docker-el8" -o "$BES_BUILD" = "docker-el9"
 then
-	echo "Packaging log files for '$BES_BUILD'"
-	tar -czf /tmp/${LOG_FILE_TGZ} `find . -name timing -prune -o -name '*.log' -print -o -name '*site_map.txt' -print`
+  echo "Packaging log files for '$BES_BUILD'"
 
-	# using: 'test -z "$AWS_ACCESS_KEY_ID" || ...' keeps after_script from running
-	# the aws cli for forked PRs (where secure env vars are null). I could've used
-	# an 'if' to block out the whole script, but I didn't... jhrg 3/21/18
+  # Create a tarball for non-docker builds from local files - kln 6/23/26
+  if ! test -f /tmp/${LOG_FILE_TGZ}; then
+    echo "No tarball found, creating a new tarball of test logs"
+    tar -czf /tmp/${LOG_FILE_TGZ} $(find . \( -name "*.log" -o -name "*site_map.txt" \) -print)
+  fi
 
-	test -z "$AWS_ACCESS_KEY_ID" || aws s3 cp /tmp/${LOG_FILE_TGZ} s3://opendap.travis.tests/
+  # using: 'test -z "$AWS_ACCESS_KEY_ID" || ...' keeps after_script from running
+  # the aws cli for forked PRs (where secure env vars are null). I could've used
+  # an 'if' to block out the whole script, but I didn't... jhrg 3/21/18
+  test -z "$AWS_ACCESS_KEY_ID" || aws s3 cp /tmp/${LOG_FILE_TGZ} ${S3_BUCKET}
 fi
 
 # A quick hack to get the gcovr report to S3. jhrg 4/20/23
@@ -21,5 +27,5 @@ then
 	# using: 'test -z "$AWS_ACCESS_KEY_ID" || ...' keeps after_script from running
 	# the aws cli for forked PRs (where secure env vars are null). I could've used
 	# an 'if' to block out the whole script, but I didn't... jhrg 3/21/18
-	test -z "$AWS_ACCESS_KEY_ID" || aws s3 cp ./gcovr_report.txt s3://opendap.travis.tests/bes-gcov-${TRAVIS_JOB_NUMBER}.txt
+	test -z "$AWS_ACCESS_KEY_ID" || aws s3 cp ./gcovr_report.txt ${S3_BUCKET}/bes-gcov-${TRAVIS_JOB_NUMBER}.txt
 fi