Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

London mocks #19

Merged
merged 14 commits into from
Aug 20, 2019
10 changes: 8 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,14 @@ Change Log
~~~~~~~~~~~~~~~~~~

* Allow status comments to be concatenated.
* Add configuration for ``cmx/`` directory.
* Additional configuration for ``datachallenge/`` directory.
* Add configuration for ``cmx/`` directory (PR `#17`_).
* Additional configuration for ``datachallenge/`` directory (PR `#18`_).
* Backups of 'london' mocks, ``mocks/lya_forest/london/`` (PR `#19`_).

.. _`#19`: https://github.com/desihub/desiBackup/pull/19
.. _`#18`: https://github.com/desihub/desiBackup/pull/18
.. _`#17`: https://github.com/desihub/desiBackup/pull/17


0.2.0 (2019-05-20)
~~~~~~~~~~~~~~~~~~
Expand Down
3 changes: 3 additions & 0 deletions bin/backupStatus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ for d in ${sections}; do
elif grep -q 'not mapped' ${cacheDir}/missing_files_${d}.log; then
c="Unmapped files found. Check configuration. ${c}"
s='NEEDS ATTENTION'
elif grep -q 'mapped to multiple' ${cacheDir}/missing_files_${d}.log; then
c="Files mapped to multiple backups. Check configuration. ${c}"
s='NEEDS ATTENTION'
elif grep -q 'not described' ${cacheDir}/missing_files_${d}.log; then
c="New directories found. Check configuration. ${c}"
s='NEEDS ATTENTION'
Expand Down
32 changes: 20 additions & 12 deletions etc/desi.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@
},
"mocks":{
"__exclude__":["lya_forest/README.html",
"lya_forest/london/README",
"lya_forest/london/lyasim.log",
"lya_forest/london/v6.0/README",
"lya_forest/london/v6.0/lyasim.log",
"lya_forest/saclay/README",
"lya_forest/saclay/README~"
],
Expand All @@ -182,6 +182,8 @@
"LGal_spectra":{
"LGal_spectra/.*$":"LGal_spectra.tar"
},
"UNIT":{
},
"bgs":{
"bgs/.*$":"bgs.tar"
},
Expand All @@ -202,17 +204,21 @@
"lya_forest":{
"lya_forest/develop/.*$":"EXCLUDE",
"lya_forest/dr11/.*$":"EXCLUDE",
"lya_forest/london/(colore_raw|tests|tools)/.*$":"EXCLUDE",
"lya_forest/london/v[23567]\\.[0-9](\\.[0-9]|)/.*$":"EXCLUDE",
"lya_forest/london/v4\\.0(\\.[0-9]|)/.*$":"EXCLUDE",
"lya_forest/london/v4\\.2\\.0/[^/]+$":"lya_forest/london/v4.2.0/lya_forest_london_v4.2.0_files.tar",
"lya_forest/london/v4\\.2\\.0/([0-9]+)/.*$":"lya_forest/london/v4.2.0/lya_forest_london_v4.2.0_\\1.tar",
"lya_forest/london/v4\\.2\\.0/quick-([0-9.]+)/.*$":"lya_forest/london/v4.2.0/lya_forest_london_v4.2.0_quick-\\1.tar",
"lya_forest/london/(v[23]\\.[0-9])/[^/]+$":"lya_forest/london/\\1/lya_forest_london_\\1_files.tar",
"lya_forest/london/(v[23]\\.[0-9])/([0-9]+)/.*$":"lya_forest/london/\\1/lya_forest_london_\\1_\\2.tar",
"lya_forest/london/(v[23]\\.[0-9])/quick-([0-9.]+)/.*$":"lya_forest/london/\\1/lya_forest_london_\\1_quick-\\2.tar",
"lya_forest/london/(v[23]\\.[0-9])/tests/.*$":"lya_forest/london/\\1/lya_forest_london_\\1_tests.tar",
"lya_forest/london/(v4\\.[0-9]\\.[0-9])/[^/]+$":"lya_forest/london/\\1/lya_forest_london_\\1_files.tar",
"lya_forest/london/(v4\\.[0-9]\\.[0-9])/([0-9]+)/.*$":"lya_forest/london/\\1/lya_forest_london_\\1_\\2.tar",
"lya_forest/london/(v4\\.[0-9]\\.[0-9])/(eboss|quick)-([0-9.]+)/[^/]+$":"lya_forest/london/\\1/\\2-\\3/lya_forest_london_\\1_\\2-\\3_files.tar",
"lya_forest/london/(v4\\.[0-9]\\.[0-9])/(eboss|quick)-([0-9.]+)/(logs|run|test-0-0)/.*$":"lya_forest/london/\\1/\\2-\\3/lya_forest_london_\\1_\\2-\\3_\\4.tar",
"lya_forest/london/(v4\\.[0-9]\\.[0-9])/(eboss|quick)-([0-9.]+)/spectra-16/([0-9]+)/.*$":"lya_forest/london/\\1/\\2-\\3/spectra-16/lya_forest_london_\\1_\\2-\\3_spectra-16_\\4.tar",
"lya_forest/london/(v4\\.[0-9]\\.[0-9])/(logs|tests)/.*$":"lya_forest/london/\\1/lya_forest_london_\\1_\\2.tar",
"lya_forest/london/v6\\.0/(v6\\.0\\.[0-9])/[^/]+$":"lya_forest/london/v6.0/\\1/lya_forest_london_v6.0_\\1_files.tar",
"lya_forest/london/v6\\.0/(v6\\.0\\.[0-9])/([0-9]+)/.*$":"lya_forest/london/v6.0/\\1/lya_forest_london_v6.0_\\1_\\2.tar",
"lya_forest/london/v6\\.0/(v6\\.0\\.[0-9])/eboss-([0-9.]+)/.*$":"lya_forest/london/v6.0/\\1/lya_forest_london_v6.0_\\1_eboss-\\2.tar",
"lya_forest/london/v6\\.0/(v6\\.0\\.[0-9])/logs/.*$":"lya_forest/london/v6.0/\\1/lya_forest_london_v6.0_\\1_logs.tar",
"lya_forest/picca/.*$":"EXCLUDE",
"lya_forest/saclay/v[23]\\.[0-9]/.*$":"EXCLUDE",
"lya_forest/saclay/v4\\.[013]/.*$":"EXCLUDE",
"lya_forest/saclay/v4\\.2/.*$":"lya_forest/saclay/lya_forest_saclay_v4.2.tar",
"lya_forest/saclay/v4\\.4/v4\\.4\\.([0-9]+)/.*$":"lya_forest/saclay/v4.4/lya_forest_saclay_v4.4_v4.4.\\1.tar",
"lya_forest/uncorr/.*$":"EXCLUDE"
},
"mws":{
Expand Down Expand Up @@ -324,6 +330,8 @@
"secondary":{
},
"stripe82-dr2":{
},
"urat_dr1":{
}
},
"users":{
Expand Down