From bc99693cc293ee12924aa62039864971e86138d0 Mon Sep 17 00:00:00 2001 From: sstaehler Date: Wed, 16 Jan 2019 16:07:23 +0100 Subject: [PATCH 1/2] get test wavefields from Polybox --- TRAVIS/get_wavefields.sh | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/TRAVIS/get_wavefields.sh b/TRAVIS/get_wavefields.sh index 3829cef..bd1de46 100755 --- a/TRAVIS/get_wavefields.sh +++ b/TRAVIS/get_wavefields.sh @@ -11,28 +11,31 @@ else # Download from gdrive is much faster (50-100MB/s) than from LMU (<10 MB/s), # but pull requests from other github accounts than seismology will not have # access to it. - if [ $encrypted_50ebf69bd92e_key == "" ]; then + wget -q https://polybox.ethz.ch/index.php/s/35W6wls9ARpUHiD/download + tar -xvf kerner_wavefields.tar.bz2 - echo "Downloading from LMU" - # 1. Download archive from LMU server - wget https://www.geophysik.uni-muenchen.de/~staehler/kerner_wavefields.tar.bz2 + # if [ $encrypted_50ebf69bd92e_key == "" ]; then - # 2. Unpack archive - tar -xvf kerner_wavefields.tar.bz2 + # echo "Downloading from LMU" + # # 1. Download archive from LMU server + # wget https://www.geophysik.uni-muenchen.de/~staehler/kerner_wavefields.tar.bz2 - else + # # 2. Unpack archive + # tar -xvf kerner_wavefields.tar.bz2 - echo "Downloading from Google Drive" - # 1. Download gdrive client - wget "https://docs.google.com/uc?id=0B3X9GlR6EmbnQ0FtZmJJUXEyRTA&export=download" -O gdrive - chmod +x ./gdrive + # else - # 2. Decrypt gdrive token - mkdir $HOME/.gdrive - openssl aes-256-cbc -K $encrypted_50ebf69bd92e_key -iv $encrypted_50ebf69bd92e_iv -in TRAVIS/token_v2.json.enc -out $HOME/.gdrive/token_v2.json -d - - # 3. Download wavefield folder with gdrive client - ./gdrive download 0BwU9d5SH6pPQNGpkcW9hWHlpYTA --recursive + # echo "Downloading from Google Drive" + # # 1. Download gdrive client + # wget "https://docs.google.com/uc?id=0B3X9GlR6EmbnQ0FtZmJJUXEyRTA&export=download" -O gdrive + # chmod +x ./gdrive - fi + # # 2. Decrypt gdrive token + # mkdir $HOME/.gdrive + # openssl aes-256-cbc -K $encrypted_50ebf69bd92e_key -iv $encrypted_50ebf69bd92e_iv -in TRAVIS/token_v2.json.enc -out $HOME/.gdrive/token_v2.json -d + # + # # 3. Download wavefield folder with gdrive client + # ./gdrive download 0BwU9d5SH6pPQNGpkcW9hWHlpYTA --recursive + + # fi fi From f7da601faea65f4aa3e6be4ba484695c3f48bee7 Mon Sep 17 00:00:00 2001 From: sstaehler Date: Wed, 16 Jan 2019 23:29:56 +0100 Subject: [PATCH 2/2] longer timeout for wget --- .travis.yml | 2 +- TRAVIS/get_wavefields.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ca35a1..3ee156b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_install: - pip install --user cpp-coveralls # Get test wavefields (2GB, takes some time) - - ./TRAVIS/get_wavefields.sh + - travis_wait 30 ./TRAVIS/get_wavefields.sh # cd tests/reference_solutions # tar -xvf test_nonmerged.tar # tar -xvf test_merged.tar diff --git a/TRAVIS/get_wavefields.sh b/TRAVIS/get_wavefields.sh index bd1de46..236f08a 100755 --- a/TRAVIS/get_wavefields.sh +++ b/TRAVIS/get_wavefields.sh @@ -11,7 +11,7 @@ else # Download from gdrive is much faster (50-100MB/s) than from LMU (<10 MB/s), # but pull requests from other github accounts than seismology will not have # access to it. - wget -q https://polybox.ethz.ch/index.php/s/35W6wls9ARpUHiD/download + wget -q https://polybox.ethz.ch/index.php/s/35W6wls9ARpUHiD/download -O kerner_wavefields.tar.bz2 tar -xvf kerner_wavefields.tar.bz2 # if [ $encrypted_50ebf69bd92e_key == "" ]; then