From 58dd80c799182b3e752d75f5993bd8863e7da230 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 22 Mar 2022 16:15:54 -0700 Subject: [PATCH] openqa/server: reduce PPC update group asset size We need to treat it and the x86_64 update group separately to do this, but it really doesn't need 200G. We have images from three weeks ago, and we don't need that kind of buffer, and space is a bit tight. Note: there is no aarch64 updates group as we do not currently run updates tests on aarch64. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa_lab | 1 + roles/openqa/server/tasks/main.yml | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/inventory/group_vars/openqa_lab b/inventory/group_vars/openqa_lab index 07c0a675a9..c488ed8643 100644 --- a/inventory/group_vars/openqa_lab +++ b/inventory/group_vars/openqa_lab @@ -19,6 +19,7 @@ fedmsg_env: stg freezes: false openqa_assetsize_ppc: 300 +openqa_assetsize_updates_ppc: 100 openqa_compose_arches: x86_64,aarch64,ppc64le openqa_dbname: openqa-stg openqa_dbpassword: "{{ stg_openqa_dbpassword }}" diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index bd7d915ea8..8100d7065b 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -391,8 +391,8 @@ 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_ppc is defined" - register: pgsqlsize - changed_when: "pgsqlsize.stdout.find('UPDATE 0') == -1" + register: pgsqlsizeppc + changed_when: "pgsqlsizeppc.stdout.find('UPDATE 0') == -1" - name: Set 'Fedora AArch64' asset size limit (if specified) (pgsql) delegate_to: "{{ openqa_dbhost }}" @@ -403,17 +403,29 @@ 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_aarch64 is defined" - register: pgsqlsize - changed_when: "pgsqlsize.stdout.find('UPDATE 0') == -1" + register: pgsqlsizeaarch64 + changed_when: "pgsqlsizeaarch64.stdout.find('UPDATE 0') == -1" -- name: Set update job group asset size limit (if specified) (pgsql) +- name: Set (x86_64) 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 }} + WHERE name = 'Fedora 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" + +- name: Set ppc64le 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_ppc }} + WHERE name = 'Fedora PowerPC Updates' AND (size_limit_gb != {{ openqa_assetsize_updates_ppc }} + OR size_limit_gb IS NULL);" + when: "openqa_dbhost is defined and openqa_assetsize_updates_ppc is defined" + register: pgsqlupdatesizeppc + changed_when: "pgsqlupdatesizeppc.stdout.find('UPDATE 0') == -1"