diff --git a/setup.py b/setup.py index 4218eb17..e28f4226 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="zstash", - version="1.6.0rc1", + version="1.6.0rc2", author="Ryan Forsyth, Chris Golaz, Zeshawn Shaheen", author_email="forsyth2@llnl.gov, golaz1@llnl.gov, shaheen2@llnl.gov", description="Long term HPSS archiving software for E3SM", diff --git a/tbump.toml b/tbump.toml index 5cd38f59..ea001916 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/E3SM-Project/zstash.git" [version] -current = "1.6.0rc1" +current = "1.6.0rc2" # Example of a semver regexp with support for PEP 440 # release candidates.Make sure this matches current_version diff --git a/tests/integration/bash_tests/run_from_perlmutter/follow_symlinks.sh b/tests/integration/bash_tests/run_from_perlmutter/follow_symlinks.sh index 7e035b2e..b5645fb5 100755 --- a/tests/integration/bash_tests/run_from_perlmutter/follow_symlinks.sh +++ b/tests/integration/bash_tests/run_from_perlmutter/follow_symlinks.sh @@ -14,6 +14,10 @@ check_log_has() done } +run_hsi() { + env -u LD_LIBRARY_PATH -u LD_PRELOAD hsi "$@" +} + setup() { echo "##########################################################################################################" @@ -22,7 +26,7 @@ setup() case_name="${3}" archive_name=$4 if [[ "${use_hpss}" == "true" ]]; then - hsi rm -R ${archive_name} + run_hsi rm -R ${archive_name} fi echo "use_hpss=${use_hpss}" echo "follow_symlinks=${follow_symlinks}" diff --git a/tests/integration/bash_tests/run_from_perlmutter/test_update_non_empty_hpss.bash b/tests/integration/bash_tests/run_from_perlmutter/test_update_non_empty_hpss.bash index f4f819c1..c99fcd15 100755 --- a/tests/integration/bash_tests/run_from_perlmutter/test_update_non_empty_hpss.bash +++ b/tests/integration/bash_tests/run_from_perlmutter/test_update_non_empty_hpss.bash @@ -14,6 +14,10 @@ check_log_has() fi } +run_hsi() { + env -u LD_LIBRARY_PATH -u LD_PRELOAD hsi "$@" +} + # base.setupDirs ############################################################## test_dir=zstash_test @@ -47,7 +51,7 @@ echo "Cache:" ls -l ${test_dir}/${cache} 2>&1 | tee ${case_name}_cache.log check_log_has "index.db" ${case_name}_cache.log echo "HPSS:" -hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log +run_hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log check_log_has "000000.tar" ${case_name}_hpss.log check_log_has "index.db" ${case_name}_hpss.log @@ -65,7 +69,7 @@ echo "Cache:" ls -l ${test_dir}/${cache} 2>&1 | tee ${case_name}_cache.log check_log_has "index.db" ${case_name}_cache.log echo "HPSS:" -hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log +run_hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log check_log_has "000000.tar" ${case_name}_hpss.log check_log_has "000001.tar" ${case_name}_hpss.log check_log_has "index.db" ${case_name}_hpss.log @@ -81,7 +85,7 @@ echo "Cache:" ls -l ${test_dir}/${cache} 2>&1 | tee ${case_name}_cache.log check_log_has "index.db" ${case_name}_cache.log echo "HPSS:" -hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log +run_hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log check_log_has "000000.tar" ${case_name}_hpss.log check_log_has "000001.tar" ${case_name}_hpss.log check_log_has "000002.tar" ${case_name}_hpss.log @@ -97,7 +101,7 @@ echo "Cache:" ls -l ${test_dir}/${cache} 2>&1 | tee ${case_name}_cache.log check_log_has "index.db" ${case_name}_cache.log echo "HPSS:" -hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log +run_hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log check_log_has "000000.tar" ${case_name}_hpss.log check_log_has "000001.tar" ${case_name}_hpss.log check_log_has "000002.tar" ${case_name}_hpss.log @@ -114,7 +118,7 @@ echo "Cache:" ls -l ${test_dir}/${cache} 2>&1 | tee ${case_name}_cache.log check_log_has "index.db" ${case_name}_cache.log echo "HPSS:" -hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log +run_hsi ls -l ${hpss_path} 2>&1 | tee ${case_name}_hpss.log check_log_has "000000.tar" ${case_name}_hpss.log check_log_has "000001.tar" ${case_name}_hpss.log check_log_has "000002.tar" ${case_name}_hpss.log @@ -135,4 +139,4 @@ rm create.log rm create_*.log rm ls.log rm update*.log -hsi rm -R ${hpss_path} +run_hsi rm -R ${hpss_path} diff --git a/zstash/__init__.py b/zstash/__init__.py index 84e895cb..9828e9fe 100644 --- a/zstash/__init__.py +++ b/zstash/__init__.py @@ -1 +1 @@ -__version__ = "v1.6.0rc1" +__version__ = "v1.6.0rc2" diff --git a/zstash/globus_utils.py b/zstash/globus_utils.py index d4402d33..b9401653 100644 --- a/zstash/globus_utils.py +++ b/zstash/globus_utils.py @@ -31,6 +31,7 @@ REGEX_ENDPOINT_MAP: Dict[str, str] = { r"theta.*\.alcf\.anl\.gov": "08925f04-569f-11e7-bef8-22000b9a448b", r"beboplogin\d+.*\.lcrc\.anl\.gov": "15288284-7006-4041-ba1a-6b52501e49f1", + r"ilogin\d+.*\.lcrc\.anl\.gov": "15288284-7006-4041-ba1a-6b52501e49f1", r"blueslogin.*\.lcrc\.anl\.gov": "15288284-7006-4041-ba1a-6b52501e49f1", r"chrlogin.*\.lcrc\.anl\.gov": "15288284-7006-4041-ba1a-6b52501e49f1", r"b\d+\.lcrc\.anl\.gov": "15288284-7006-4041-ba1a-6b52501e49f1",