From 25d1c79a4b709e03b80a9597bfac3690de7203b9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 30 Nov 2017 11:45:49 -0800 Subject: [PATCH] Tweak openQA asset size settings again Staging is running out of space...let's kick it back down to 300, and also create a separate setting for update group asset size. We test lots of updates, and for each update we only need to upload one disk image, so we really don't need 300GB of asset space for update job groups, that just means we'll keep like 300 update disk images lying around. If PPC starts getting incompletions again I'll have to, uh, do something? Yeahhh. Something. --- inventory/group_vars/openqa | 1 + inventory/group_vars/openqa-stg | 3 ++- roles/openqa/server/tasks/main.yml | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index 973c24f611..dacef49975 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -16,6 +16,7 @@ openqa_dbhost: db-qa01.qa.fedoraproject.org openqa_dbuser: openqa openqa_dbpassword: "{{ prod_openqa_dbpassword }}" openqa_assetsize: 300 +openqa_assetsize_updates: 50 openqa_key: "{{ prod_openqa_apikey }}" openqa_secret: "{{ prod_openqa_apisecret }}" diff --git a/inventory/group_vars/openqa-stg b/inventory/group_vars/openqa-stg index ad043bcc2f..9b10299df8 100644 --- a/inventory/group_vars/openqa-stg +++ b/inventory/group_vars/openqa-stg @@ -26,7 +26,8 @@ openqa_dbname: openqa-stg openqa_dbhost: db-qa01.qa.fedoraproject.org openqa_dbuser: openqastg openqa_dbpassword: "{{ stg_openqa_dbpassword }}" -openqa_assetsize: 400 +openqa_assetsize: 300 +openqa_assetsize_updates: 50 openqa_key: "{{ stg_openqa_apikey }}" openqa_secret: "{{ stg_openqa_apisecret }}" diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index b557c728e6..676c8ebb7e 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -33,6 +33,11 @@ ## int - the asset size limit to set in GB (upstream default is 100GB) ## higher is recommended for normal Fedora testing, 300GB is good ## FIXME: this only works for pgsql ATM +# - openqa_assetsize_updates +## int - the asset size limit to set for update job groups in GB +## (upstream default is 100GB). Lower is recommended for normal +## Fedora testing, 50GB is good +## FIXME: this only works for pgsql ATM # - deployment_type ## string - Fedora Infrastructure thing; for this role, decides ## whether to enable some openQA plugins that should be @@ -273,7 +278,16 @@ delegate_to: "{{ openqa_dbhost }}" become_user: postgres become: true - command: "psql -d {{ openqa_dbname }} -c \"UPDATE job_groups SET size_limit_gb = {{ openqa_assetsize }} WHERE size_limit_gb != {{ openqa_assetsize }};\"" + command: "psql -d {{ openqa_dbname }} -c \"UPDATE job_groups SET size_limit_gb = {{ openqa_assetsize }} WHERE NOT name LIKE '%Updates%' AND (size_limit_gb != {{ openqa_assetsize }} OR size_limit_gb IS NULL);\"" when: "openqa_dbhost is defined and openqa_assetsize is defined" register: pgsqlsize changed_when: "pgsqlsize.stdout.find('UPDATE 0') == -1" + +- name: Set update job group asset size limit (if specified) (pgsql) + delegate_to: "{{ openqa_dbhost }}" + become_user: postgres + become: true + command: "psql -d {{ openqa_dbname }} -c \"UPDATE job_groups SET size_limit_gb = {{ openqa_assetsize_updates }} WHERE name LIKE '%Updates%' AND (size_limit_gb != {{ openqa_assetsize_updates }} OR size_limit_gb IS NULL);\"" + when: "openqa_dbhost is defined and openqa_assetsize_updates is defined" + register: pgsqlupdatesize + changed_when: "pgsqlupdatesize.stdout.find('UPDATE 0') == -1"