Changeset 27708

Timestamp:

04/26/23 14:32:30 (2 years ago)

Author:

jdquinn

Message:

CHG: Download examples datasets if they are not already present when running Jenkins builds

Location:

issm/trunk-jpl

Files:

• jenkins/jenkins.sh (modified) (1 diff)
• scripts/DownloadExamplesDatasets.sh (modified) (2 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -450 +450 @@
 if [ $EXAMPLES_TEST -eq 1 ]; then
         export MATLAB_PATH
+
+        # Download examples datasets if they are not already present
+        if [[ -z $(ls -A1q $ISSM_DIR/examples/Data) ]]; then
+                $ISSM_DIR/scripts/DownloadExamplesDatasets.sh
+        fi
+
         $ISSM_DIR/jenkins/examples_tests.sh
 fi

issm/trunk-jpl/scripts/DownloadExamplesDatasets.sh

@@ -25 +25 @@
 fi
 
-# Get content of page that hosts datasets, reduce to just datasets list, then 
+# Get content of page that hosts datasets, reduce to just datasets list, then
 # parse out dataset links
+#
+# NOTE: Clear DYLD_LIBRARY_PATH in case we have installed our own copy of cURL
+#               and $ISSM_DIR/etc/environment.sh has been sourced as there may be a
+#               conflict between versions of cURL executable and libcurl
+#
 dataset_urls=$(\
+        DYLD_LIBRARY_PATH=""; \
         curl -Ls ${DATASETS_URL} |\
         sed '/<!--DATASETS LIST START-->/,/<!--DATASETS LIST END-->/ !d' |\
@@ -34 +40 @@
 
 # Get datasets
-wget --no-clobber --directory-prefix="${DIRECTORY_PREFIX}" -i - <<< "${dataset_urls}"
+#
+echo "Downloading examples datasets..."
+wget --quiet --no-clobber --directory-prefix="${DIRECTORY_PREFIX}" -i - <<< "${dataset_urls}"
 
 # Expand zip files