diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2016-03-12 19:49:51 +0000 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2016-03-12 19:49:51 +0000 |
| commit | d793179adc9f865c5b2cd9b569929fce042d8da6 (patch) | |
| tree | e38ea4fcb075384bb02a4514a6f8e733e09d8a46 | |
| parent | f3cf4bfa48f10fe9f7b45ab8194511174e567a1b (diff) | |
| download | ybd-d793179adc9f865c5b2cd9b569929fce042d8da6.tar.gz | |
Revert "Change default min-gigabytes config to 0"
This reverts commit 9be72d2438949d4fd4d2cdf7c9f0c7af257c4aa8.
Now that the cull won't remove artifacts required in the ybd run,
I believe the previous default is sensible.
| -rw-r--r-- | readme.md | 2 | ||||
| -rw-r--r-- | ybd/cache.py | 6 | ||||
| -rw-r--r-- | ybd/config/ybd.conf | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -161,7 +161,7 @@ config values you may want to override include: kbas-password: 'insecure' # password if you want to push artifacts to kbas log-elapsed: True # log elapsed times since start, or actual time log-verbose: False # log extra info including all sandbox installation steps - min-gigabytes: 0 # space required by ybd. set this to a positive value to cause ybd to automatically delete artifacts to free up space + min-gigabytes: 10 # space required by ybd. artifacts are culled to free this no-build: False # for testing/debugging ybd - if True, only run the assembly logic, don't compile things reproduce: False # if True, build and compare against artifacts on server schemas: # files defining schemas for definitions (currently schemas/*) diff --git a/ybd/cache.py b/ybd/cache.py index c209957..0c9198a 100644 --- a/ybd/cache.py +++ b/ybd/cache.py @@ -292,7 +292,7 @@ def cull(artifact_dir): for artifact in artifacts: stat = os.statvfs(artifact_dir) free = stat.f_frsize * stat.f_bavail / 1000000000 - if free >= app.config.get('min-gigabytes', 0): + if free >= app.config.get('min-gigabytes', 10): app.log('SETUP', '%sGB is enough free space' % free) if deleted > 0: app.log('SETUP', 'Culled %s items in' % deleted, @@ -318,9 +318,9 @@ def cull(artifact_dir): stat = os.statvfs(artifact_dir) free = stat.f_frsize * stat.f_bavail / 1000000000 - if free < app.config.get('min-gigabytes', 0): + if free < app.config.get('min-gigabytes', 10): app.exit('SETUP', 'ERROR: %sGB is less than min-gigabytes:' % free, - app.config.get('min-gigabytes', 0)) + app.config.get('min-gigabytes', 10)) def check(artifact): diff --git a/ybd/config/ybd.conf b/ybd/config/ybd.conf index 3425287..694cb38 100644 --- a/ybd/config/ybd.conf +++ b/ybd/config/ybd.conf @@ -20,7 +20,7 @@ kbas-url: 'http://artifacts1.baserock.org:8000/' kbas-password: 'insecure' log-elapsed: True log-verbose: False -min-gigabytes: 0 +min-gigabytes: 10 no-ccache: False no-distcc: True schemas: |