From e069489ecc5a29147de5870dcf7c5ab3e1e9aa1d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 22 Mar 2018 16:06:42 -0700 Subject: [PATCH] Tweak openQA asset size settings again The UI makes this easier to investigate now, and it looks like we could give x86_64 a bit more space, but other arches less. So let's tweak things to do that. This should also reduce overall usage on staging a bit, as it's up against its limits. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa-stg | 6 ++++-- roles/openqa/server/tasks/main.yml | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/openqa-stg b/inventory/group_vars/openqa-stg index 63ad3a4839..971a34887f 100644 --- a/inventory/group_vars/openqa-stg +++ b/inventory/group_vars/openqa-stg @@ -26,8 +26,10 @@ openqa_dbname: openqa-stg openqa_dbhost: db-qa01.qa.fedoraproject.org openqa_dbuser: openqastg openqa_dbpassword: "{{ stg_openqa_dbpassword }}" -openqa_assetsize: 410 -openqa_assetsize_updates: 160 +openqa_assetsize: 450 +openqa_assetsize_ppc: 150 +openqa_assetsize_aarch64: 150 +openqa_assetsize_updates: 75 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 73af666461..9c5d2b27f6 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -281,11 +281,29 @@ changed_when: "testsdiff.rc > 0" failed_when: "1 != 1" -- name: Set asset size limit (if specified) (pgsql) +- name: Set 'fedora' 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 }} WHERE NOT name LIKE '%Updates%' AND (size_limit_gb != {{ openqa_assetsize }} OR size_limit_gb IS NULL);\"" + command: "psql -d {{ openqa_dbname }} -c \"UPDATE job_groups SET size_limit_gb = {{ openqa_assetsize }} WHERE name == 'fedora' 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 'Fedora PowerPC' 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_ppc }} WHERE name == 'Fedora PowerPC' AND (size_limit_gb != {{ openqa_assetsize_ppc }} 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 'Fedora AArch64' 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_aarch64 }} WHERE name == 'Fedora AArch64' AND (size_limit_gb != {{ openqa_assetsize_aarch64 }} 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"