From d4fcdaa7a20fcbeba5974ce9e36c287950d5acb4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 23 Mar 2018 15:44:54 +0000 Subject: [PATCH 1/3] drop jenkins f27 ppc host to large from xlarge --- .../host_vars/jenkins-slave-f27-ppc64le.fedorainfracloud.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/host_vars/jenkins-slave-f27-ppc64le.fedorainfracloud.org b/inventory/host_vars/jenkins-slave-f27-ppc64le.fedorainfracloud.org index f86fdf5e62..38e7e8a3a8 100644 --- a/inventory/host_vars/jenkins-slave-f27-ppc64le.fedorainfracloud.org +++ b/inventory/host_vars/jenkins-slave-f27-ppc64le.fedorainfracloud.org @@ -1,6 +1,6 @@ --- image: Fedora-Cloud-Base-27-1.6.ppc64le -instance_type: m1.xlarge +instance_type: m1.large keypair: fedora-admin-20130801 security_group: ssh-anywhere-persistent,all-icmp-persistent,default zone: nova From 7788abfbd076b5e01e14b11b83cb135aad7f0cfe Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 23 Mar 2018 18:00:31 +0100 Subject: [PATCH 2/3] copr-be: lower vm limits for ppc64le not to overload cloud --- roles/copr/backend/templates/copr-be.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2 index 4aae1e2b31..afe60c0751 100644 --- a/roles/copr/backend/templates/copr-be.conf.j2 +++ b/roles/copr/backend/templates/copr-be.conf.j2 @@ -59,8 +59,8 @@ group1_max_vm_total=2 group1_max_spawn_processes=2 {% else %} group1_max_vm_per_user=5 -group1_max_vm_total=10 -group1_max_spawn_processes=3 +group1_max_vm_total=6 +group1_max_spawn_processes=2 {% endif %} # directory where results are stored From 1e274cbcf625567796f004e38b9980518ebd9f28 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 23 Mar 2018 18:22:24 +0000 Subject: [PATCH 3/3] oh yeah order matters in pattern matching --- roles/web-data-analysis/files/mirrors-data.awk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/web-data-analysis/files/mirrors-data.awk b/roles/web-data-analysis/files/mirrors-data.awk index f1e35e8683..b265186b54 100644 --- a/roles/web-data-analysis/files/mirrors-data.awk +++ b/roles/web-data-analysis/files/mirrors-data.awk @@ -76,11 +76,6 @@ BEGIN{ else if ($3 ~"epel5") { epel5=epel5+1; epel=epel+1} else if ($3 ~"epel6") { epel6=epel6+1; epel=epel+1} else if ($3 ~"epel7") { epel7=epel7+1; epel=epel+1} - else if ($3 ~"modular_f27") { modular_f27=modular_f27+1; modular=modular+1; fedora=fedora+1 } - else if ($3 ~"modular_f28") { modular_f28=modular_f28+1; modular=modular+1; fedora=fedora+1 } - else if ($3 ~"modular_f29") { modular_f29=modular_f29+1; modular=modular+1; fedora=fedora+1 } - else if ($3 ~"modular_f30") { modular_f30=modular_f30+1; modular=modular+1; fedora=fedora+1 } - else if ($3 ~"modular") { modular=modular+1; fedora=fedora+1 } else if ($3 ~"f03") { f03=f03+1; fedora=fedora+1} else if ($3 ~"f04") { f04=f04+1; fedora=fedora+1} else if ($3 ~"f05") { f05=f05+1; fedora=fedora+1} @@ -111,6 +106,11 @@ BEGIN{ else if ($3 ~"f30") { f30=f30+1; fedora=fedora+1} else if ($3 ~"rawhide_modular") { rawhide_modular=rawhide_modular+1; modular=modular+1; fedora=fedora+1} else if ($3 ~"rawhide") { rawhide=rawhide+1; fedora=fedora+1} + else if ($3 ~"modular_f27") { modular_f27=modular_f27+1; modular=modular+1; fedora=fedora+1 } + else if ($3 ~"modular_f28") { modular_f28=modular_f28+1; modular=modular+1; fedora=fedora+1 } + else if ($3 ~"modular_f29") { modular_f29=modular_f29+1; modular=modular+1; fedora=fedora+1 } + else if ($3 ~"modular_f30") { modular_f30=modular_f30+1; modular=modular+1; fedora=fedora+1 } + else if ($3 ~"modular") { modular=modular+1; fedora=fedora+1 } else if ($3 ~"centos") { centos=centos+1; epel=epel+1} else if ($3 ~"rhel") { rhel=rhel+1; epel=epel+1} else { unknown_release = unknown_release + 1 ; };