From 88db2b665a4c65e020836f9d927bd2e5722e87c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Tue, 16 Jan 2018 14:59:36 +0100 Subject: [PATCH 01/12] taskotron-dev: enable task-rpmdeplint It's been ansiblized. --- .../taskotron-trigger/templates/trigger_rules.yml.j2.dev | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev index 88dc792cbd..3c310c23a7 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev @@ -9,3 +9,9 @@ $nin: [{{ trigger_abicheck_blacklist | join(',') }}] do: - {tasks: [abicheck]} + +- when: + message_type: KojiTagChanged + tag: {$regex: '/^f[0-9]{2}-updates(-testing)?-pending$$/'} + do: + - {tasks: [rpmdeplint]} From 2333f77787ad86e5b0c0d09e5425b9c857018c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 16 Jan 2018 16:27:56 +0000 Subject: [PATCH 02/12] Hubs: use the dummy FAS user --- roles/hubs/templates/fedmsg_config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/hubs/templates/fedmsg_config b/roles/hubs/templates/fedmsg_config index 96a7ce8400..064401878d 100644 --- a/roles/hubs/templates/fedmsg_config +++ b/roles/hubs/templates/fedmsg_config @@ -19,5 +19,11 @@ config = { # Fedmsg hub consumer 'hubs.consumer.enabled': True, 'hubs.redis.triage-queue-name': 'fedora-hubs-triage-queue', + + # FAS + 'fas_credentials': { + 'username': '{{ fedoraDummyUser }}', + 'password': '{{ fedoraDummyUserPassword }}', + }, } From 96482b42dcba35cb15461d9aa3accfaa6fdcbde5 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 16 Jan 2018 18:19:30 +0000 Subject: [PATCH 03/12] another year, move the graphs up --- .../web-data-analysis/files/getfedora-data.gp | 14 ++++---- .../web-data-analysis/files/getstuff-data.gp | 18 +++++------ roles/web-data-analysis/files/hotspot.gp | 4 +-- roles/web-data-analysis/files/mirrors-data.gp | 28 ++++++++-------- .../web-data-analysis/files/mirrors-moving.gp | 32 +++++++++---------- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/roles/web-data-analysis/files/getfedora-data.gp b/roles/web-data-analysis/files/getfedora-data.gp index a42eabb90c..16b9a4e8ed 100644 --- a/roles/web-data-analysis/files/getfedora-data.gp +++ b/roles/web-data-analysis/files/getfedora-data.gp @@ -9,7 +9,7 @@ set term png size 1600,1200 ## set output "/var/www/html/csv-reports/images/getfedora-allpoints.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -41,7 +41,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -54,7 +54,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions-filled.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($4+$5+$6+$7+$8) title 'Atomic' with filledcurves x1,\ @@ -67,7 +67,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-versions-filled.png" set title "Daily Version Totals" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-20' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:( $10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-21' with filledcurves x1,\ @@ -85,7 +85,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch.png" set title "Daily x86 Architectures Filled Totals" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($25+$26) title 'x86_32' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($26) title 'x86_64' with filledcurves x1 @@ -94,7 +94,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2017-12-31"] \ +plot ["2014-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:29 title 'Server' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:30 title 'Workstation' with lines lw 4,\ @@ -104,7 +104,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls-filled.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2017-12-31"] \ +plot ["2014-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($29+$30+$31) title 'Server' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($30+$31) title 'Workstation' with filledcurves x1,\ diff --git a/roles/web-data-analysis/files/getstuff-data.gp b/roles/web-data-analysis/files/getstuff-data.gp index 96ac8e9b62..2490adc1ff 100644 --- a/roles/web-data-analysis/files/getstuff-data.gp +++ b/roles/web-data-analysis/files/getstuff-data.gp @@ -9,7 +9,7 @@ set term png size 1600,1200 ## set output "/var/www/html/csv-reports/images/getfedora-allpoints.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -60,7 +60,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -73,7 +73,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions-filled.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($4+$5+$6+$7+$8) title 'Atomic' with filledcurves x1,\ @@ -86,7 +86,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-versions-filled.png" set title "Daily Version Totals" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-20' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:( $10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-21' with filledcurves x1,\ @@ -104,7 +104,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch.png" set title "Daily Architectures Totals" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:20 title 'Arm 32' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:21 title 'Arm 64' with lines lw 4,\ @@ -119,7 +119,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch-top2-filled.png" set title "Daily x86 Architectures Filled Totals" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($25+$26) title 'x86_32' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($26) title 'x86_64' with filledcurves x1 @@ -128,7 +128,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch-less-filled.png" set title "Daily Other Architectures Totals" -plot ["2014-01-01":"2017-12-31"] \ +plot ["2014-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($20+$21+$22+$23+$24+$25) title 'arm_32' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($21+$22+$23+$24+$25) title 'arm_64' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($22+$23+$24+$25) title 'ppc_le' with filledcurves x1,\ @@ -140,7 +140,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2017-12-31"] \ +plot ["2014-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:29 title 'Server' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:30 title 'Workstation' with lines lw 4,\ @@ -150,7 +150,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls-filled.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2017-12-31"] \ +plot ["2014-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($29+$30+$31) title 'Server' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($30+$31) title 'Workstation' with filledcurves x1,\ diff --git a/roles/web-data-analysis/files/hotspot.gp b/roles/web-data-analysis/files/hotspot.gp index 78e45d2fd7..9cb2fda426 100644 --- a/roles/web-data-analysis/files/hotspot.gp +++ b/roles/web-data-analysis/files/hotspot.gp @@ -9,7 +9,7 @@ set term png size 1600,1200 ## set output "/var/www/html/csv-reports/images/hotspot-all.png" set title "IPs grabbing hotspot per day" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/hotspot/hotspotdata-all.csv' using 1:2 title 'Average every 5min' with lines lw 4, \ '/var/www/html/csv-reports/hotspot/hotspotdata-all.csv' using 1:3 title 'Least 5min' with lines lw 4, \ '/var/www/html/csv-reports/hotspot/hotspotdata-all.csv' using 1:4 title 'Max 5min' with lines lw 4 @@ -18,7 +18,7 @@ unset output ## set output "/var/www/html/csv-reports/images/hotspot-all-ma.png" set title "Moving Average of IPs grabbing hotspot" -plot ["2014-12-01":"2017-12-31"] \ +plot ["2014-12-01":"2018-12-31"] \ '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:2 title 'Average every 5min' with lines lw 4, \ '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:3 title 'Least 5min' with lines lw 4, \ '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:4 title 'Max 5min' with lines lw 4 diff --git a/roles/web-data-analysis/files/mirrors-data.gp b/roles/web-data-analysis/files/mirrors-data.gp index 62e787649e..984ff93674 100644 --- a/roles/web-data-analysis/files/mirrors-data.gp +++ b/roles/web-data-analysis/files/mirrors-data.gp @@ -10,7 +10,7 @@ set key outside right top Right title 'Legend' box 3 ## set output "/var/www/html/csv-reports/images/mirrors-all-points.png" set title "Fedora+Epel Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:2 title 'epel4' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:3 title 'epel5' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:4 title 'epel6' with lines lw 3,\ @@ -70,13 +70,13 @@ unset output set output "/var/www/html/csv-reports/images/fedora-daily.png" set title "Fedora Daily Totals Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:36 title 'Fedora' with lines lw 3 unset output set output "/var/www/html/csv-reports/images/fedora-os-all.png" set title "Fedora OS Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:6 title 'fed03' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:7 title 'fed04' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:8 title 'fed05' with lines lw 3,\ @@ -110,7 +110,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest.png" set title "Fedora Selected Versions Unique IPs" -plot ["2014-01-01":"2017-12-31"] \ +plot ["2014-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:36 title 'Fedora' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:30 title 'fed27' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:24 title 'fed21' with lines lw 3,\ @@ -125,7 +125,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest-stacked.png" set title "Fedora Selected Versions Unique IPs" -plot ["2013-01-01":"2017-12-31"] \ +plot ["2013-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:36 title 'Fedora' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($27+$28+$29+$30+$33) title 'fed24' with filledcurves x1,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($28+$29+$30+$33) title 'fed25' with filledcurves x1,\ @@ -136,7 +136,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-hardware-full.png" set title "Fedora Hardware via Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:37 title 'alpha' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:38 title 'ARM' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:39 title 'ARM64' with lines lw 3,\ @@ -153,7 +153,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-hardware-2nd.png" set title "Fedora Secondary via Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:37 title 'alpha' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:38 title 'ARM' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:39 title 'ARM64' with lines lw 3,\ @@ -168,7 +168,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-epel-stacked.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33+$34) title 'unknown-release' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'rawhide' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed29' w filledcurves x1, \ @@ -207,7 +207,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-stacked.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33+$34) title 'unknown-release' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'rawhide' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed29' w filledcurves x1, \ @@ -241,7 +241,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-select-stacked.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'fedora-future' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed25-30' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27) title 'fed19-24' w filledcurves x1, \ @@ -256,7 +256,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-all.png" set title "Epel Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:2 title 'epel4' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:3 title 'epel5' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:4 title 'epel6' with lines lw 3,\ @@ -266,14 +266,14 @@ unset output set output "/var/www/html/csv-reports/images/epel-daily.png" set title "Fedora Epel Totals Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:35 title 'EPEL' with lines lw 3 unset output set output "/var/www/html/csv-reports/images/epel-arch.png" set title "Epel ARCH Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:48 title 'x86_32' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:50 title 'x86_64' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:52 title 'ppc' with lines lw 3,\ @@ -282,7 +282,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-stacked.png" set title "Epel Releases Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5) title 'epel7' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4) title 'epel6' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3) title 'epel5' w filledcurves x1, \ diff --git a/roles/web-data-analysis/files/mirrors-moving.gp b/roles/web-data-analysis/files/mirrors-moving.gp index 5f95b35519..747d3849f9 100644 --- a/roles/web-data-analysis/files/mirrors-moving.gp +++ b/roles/web-data-analysis/files/mirrors-moving.gp @@ -10,7 +10,7 @@ set key outside right top Right title 'Legend' box 3 ## set output "/var/www/html/csv-reports/images/mirrors-all-points-ma.png" set title "Fedora+Epel Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:2 title 'epel4' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:3 title 'epel5' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:4 title 'epel6' with lines lw 3,\ @@ -70,13 +70,13 @@ unset output set output "/var/www/html/csv-reports/images/fedora-daily-ma.png" set title "Fedora Daily Totals Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:36 title 'Fedora' with lines lw 3 unset output set output "/var/www/html/csv-reports/images/fedora-os-all-ma.png" set title "Fedora OS Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:6 title 'fed03' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:7 title 'fed04' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:8 title 'fed05' with lines lw 3,\ @@ -110,7 +110,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest-ma.png" set title "Fedora Selected Versions Unique IPs" -plot ["2014-01-01":"2017-12-31"] \ +plot ["2014-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:36 title 'Fedora' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:30 title 'fed27' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:24 title 'fed21' with lines lw 3,\ @@ -125,7 +125,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest-stacked-ma.png" set title "Fedora Selected Versions Unique IPs" -plot ["2013-01-01":"2017-12-31"] \ +plot ["2013-01-01":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:36 title 'Fedora' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($27+$28+$29+$30+$33) title 'fed24' with filledcurves x1,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($28+$29+$30+$33) title 'fed25' with filledcurves x1,\ @@ -136,7 +136,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-hardware-full-ma.png" set title "Fedora Hardware via Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:37 title 'alpha' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:38 title 'ARM' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:39 title 'ARM64' with lines lw 3,\ @@ -153,7 +153,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-hardware-2nd-ma.png" set title "Fedora Secondary via Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:37 title 'alpha' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:38 title 'ARM' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:39 title 'ARM64' with lines lw 3,\ @@ -168,7 +168,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-epel-stacked-ma.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33+$34) title 'unknown-release' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'rawhide' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed29' w filledcurves x1, \ @@ -207,7 +207,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-stacked-ma.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33+$34) title 'unknown-release' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'rawhide' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed29' w filledcurves x1, \ @@ -241,7 +241,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-rev-all-stacked-ma.png" set title "Fedora Yum Reverse Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8+$7+$6) title 'fed03' w filledcurves x1 lc rgb "#F0F0F0", \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8+$7) title 'fed04' w filledcurves x1 lc rgb "#F0F0F0", \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8) title 'fed05' w filledcurves x1 lc rgb "#F0F0F0", \ @@ -275,7 +275,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-rev-latest-stacked-ma.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27) title 'fed24' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28) title 'fed25' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29) title 'fed26' w filledcurves x1, \ @@ -289,7 +289,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-select-stacked-ma.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'fedora-future' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed25-30' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27) title 'fed19-24' w filledcurves x1, \ @@ -304,7 +304,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-all-ma.png" set title "Epel Yum Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:2 title 'epel4' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:3 title 'epel5' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:4 title 'epel6' with lines lw 3,\ @@ -314,14 +314,14 @@ unset output set output "/var/www/html/csv-reports/images/epel-daily-ma.png" set title "Fedora Epel Totals Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:35 title 'EPEL' with lines lw 3 unset output set output "/var/www/html/csv-reports/images/epel-arch-ma.png" set title "Epel ARCH Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:48 title 'x86_32' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:50 title 'x86_64' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:52 title 'ppc' with lines lw 3,\ @@ -330,7 +330,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-stacked-ma.png" set title "Epel Releases Unique IPs" -plot ["2007-05-17":"2017-12-31"] \ +plot ["2007-05-17":"2018-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5) title 'epel7' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4) title 'epel6' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3) title 'epel5' w filledcurves x1, \ From 50ec59b9b827a17cd090861074c7e50495198040 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 16 Jan 2018 19:47:55 +0000 Subject: [PATCH 04/12] Disable wiki Badges plugin for now due to performance reasons Signed-off-by: Patrick Uiterwijk --- roles/mediawiki/templates/LocalSettings.php.fp.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 78ffe5eab0..07c0ba77d7 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -502,7 +502,9 @@ $wgDisableCounters = true; $wgStyleVersion = '273'; # Fedora Badges Extension -require_once( "$IP/extensions/FedoraBadges/FedoraBadges.php" ); +# This needs optimizations before it can be re-enabled. +# Without those, edits on user pages take >1 minute, which is longer than the timeout. +//require_once( "$IP/extensions/FedoraBadges/FedoraBadges.php" ); wfLoadExtension( 'WikiEditor' ); # Enables use of WikiEditor by default but still allows users to disable it in preferences From f3331e8fd46e1eb26fed430e18e6eedffb9af4de Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 19:50:57 +0000 Subject: [PATCH 05/12] see if this gets us more info --- inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org | 1 + 1 file changed, 1 insertion(+) diff --git a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org index c1c8bbc683..32bcaa56c5 100644 --- a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org @@ -2,3 +2,4 @@ vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.86 eth1_ip: 10.5.127.138 +virt_install_command: "{{ virt_install_command_two_nic }} --graphics spice" From 1868c0d75111a8d4462f15290cb790e975a4f23a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 19:54:25 +0000 Subject: [PATCH 06/12] ok, how about vnc? --- inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org index 32bcaa56c5..87e3e1b9e4 100644 --- a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org @@ -2,4 +2,4 @@ vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.86 eth1_ip: 10.5.127.138 -virt_install_command: "{{ virt_install_command_two_nic }} --graphics spice" +virt_install_command: "{{ virt_install_command_two_nic }} --graphics vnc" From 679f3f6fbe8da1fcf3f81363bd6561c6c25561b6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 19:59:39 +0000 Subject: [PATCH 07/12] helps if you use a unique ip address instead of another ones --- inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org index 87e3e1b9e4..0e43e23a9f 100644 --- a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org @@ -1,5 +1,4 @@ --- vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.86 -eth1_ip: 10.5.127.138 -virt_install_command: "{{ virt_install_command_two_nic }} --graphics vnc" +eth1_ip: 10.5.127.120 From 8f8772f1e0f71967ffb73a93f5e55c3c7e841fb2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 20:10:27 +0000 Subject: [PATCH 08/12] Fix some more nfs ips --- inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org index fb7679f2ef..749dd0ce6c 100644 --- a/inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.50 -eth1_ip: 10.5.127.120 +eth1_ip: 10.5.127.133 diff --git a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org index 0e43e23a9f..c1c8bbc683 100644 --- a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.86 -eth1_ip: 10.5.127.120 +eth1_ip: 10.5.127.138 diff --git a/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org index 5431c3c11b..40768c63f2 100644 --- a/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.57 -eth1_ip: 10.5.127.138 +eth1_ip: 10.5.127.134 From 6811e48da386f061d02d2dd256322e572e456f74 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 20:26:49 +0000 Subject: [PATCH 09/12] Add buildvm-ppc64{le} 15-19 --- inventory/builders | 10 ++++++++++ .../host_vars/buildvm-ppc64-15.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64-16.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64-17.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64-18.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64-19.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org | 5 +++++ .../host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org | 5 +++++ 11 files changed, 60 insertions(+) create mode 100644 inventory/host_vars/buildvm-ppc64-15.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64-16.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64-17.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64-18.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64-19.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org diff --git a/inventory/builders b/inventory/builders index d262d3a749..ac7a7d6a3a 100644 --- a/inventory/builders +++ b/inventory/builders @@ -203,6 +203,11 @@ buildvm-ppc64-11.ppc.fedoraproject.org buildvm-ppc64-12.ppc.fedoraproject.org buildvm-ppc64-13.ppc.fedoraproject.org buildvm-ppc64-14.ppc.fedoraproject.org +buildvm-ppc64-15.ppc.fedoraproject.org +buildvm-ppc64-16.ppc.fedoraproject.org +buildvm-ppc64-17.ppc.fedoraproject.org +buildvm-ppc64-18.ppc.fedoraproject.org +buildvm-ppc64-19.ppc.fedoraproject.org # # These are primary koji builders. @@ -222,6 +227,11 @@ buildvm-ppc64le-11.ppc.fedoraproject.org buildvm-ppc64le-12.ppc.fedoraproject.org buildvm-ppc64le-13.ppc.fedoraproject.org buildvm-ppc64le-14.ppc.fedoraproject.org +buildvm-ppc64le-15.ppc.fedoraproject.org +buildvm-ppc64le-16.ppc.fedoraproject.org +buildvm-ppc64le-17.ppc.fedoraproject.org +buildvm-ppc64le-18.ppc.fedoraproject.org +buildvm-ppc64le-19.ppc.fedoraproject.org [bkernel] bkernel01.phx2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64-15.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-15.ppc.fedoraproject.org new file mode 100644 index 0000000000..4dd7d0bead --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64-15.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.51 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64-16.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-16.ppc.fedoraproject.org new file mode 100644 index 0000000000..f0ccdee354 --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64-16.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.52 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64-17.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-17.ppc.fedoraproject.org new file mode 100644 index 0000000000..bc823cf333 --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64-17.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.53 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64-18.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-18.ppc.fedoraproject.org new file mode 100644 index 0000000000..d2c42cd4f8 --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64-18.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.54 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64-19.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-19.ppc.fedoraproject.org new file mode 100644 index 0000000000..f7fe622254 --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64-19.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.55 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org new file mode 100644 index 0000000000..c577d86111 --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64le-15.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.58 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org new file mode 100644 index 0000000000..62ac2267d8 --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64le-16.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.59 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org new file mode 100644 index 0000000000..eb6d33a30b --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64le-17.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.60 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org new file mode 100644 index 0000000000..0c1bf45300 --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64le-18.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.61 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org new file mode 100644 index 0000000000..0e4984c0df --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64le-19.ppc.fedoraproject.org @@ -0,0 +1,5 @@ +--- +vmhost: ppc8-04.ppc.fedoraproject.org +eth0_ip: 10.5.129.62 +createrepo: False +virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" From ac01a47ba71dee4a0af2fac28bace66aba6feee4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 21:54:16 +0000 Subject: [PATCH 10/12] adjust twoweek composes --- roles/releng/files/twoweek-updates | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/releng/files/twoweek-updates b/roles/releng/files/twoweek-updates index b44fae7f19..6f4cf94884 100644 --- a/roles/releng/files/twoweek-updates +++ b/roles/releng/files/twoweek-updates @@ -1,6 +1,6 @@ -#Fedora 26 two-week updates nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 8 * * * root TMPDIR=`mktemp -d /tmp/twoweekF26.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f26 && LANG=en_US.UTF-8 ./twoweek-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR +#Fedora 28 two-week updates nightly compose +#MAILTO=releng-cron@lists.fedoraproject.org +#15 8 * * * root TMPDIR=`mktemp -d /tmp/twoweekF28.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f28 && LANG=en_US.UTF-8 ./twoweek-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR #Fedora 27 two-week updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org From 5c7650801de506266a29469f04feb5fcdce5441d Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 16 Jan 2018 20:49:39 +0000 Subject: [PATCH 11/12] Revert "Disable wiki Badges plugin for now due to performance reasons" This reverts commit 50ec59b9b827a17cd090861074c7e50495198040. --- roles/mediawiki/templates/LocalSettings.php.fp.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 07c0ba77d7..78ffe5eab0 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -502,9 +502,7 @@ $wgDisableCounters = true; $wgStyleVersion = '273'; # Fedora Badges Extension -# This needs optimizations before it can be re-enabled. -# Without those, edits on user pages take >1 minute, which is longer than the timeout. -//require_once( "$IP/extensions/FedoraBadges/FedoraBadges.php" ); +require_once( "$IP/extensions/FedoraBadges/FedoraBadges.php" ); wfLoadExtension( 'WikiEditor' ); # Enables use of WikiEditor by default but still allows users to disable it in preferences From 69ef6a884638b3da6be7d484242cfd727890c8c3 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 16 Jan 2018 22:10:46 +0000 Subject: [PATCH 12/12] Revert "Also deploy certs for managing registry to prod" This reverts commit 199de030b6ae1a0128e979a51c65decfd0f9a98c. --- playbooks/groups/releng-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 48d4aa5595..8474051fdd 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -55,15 +55,17 @@ - fedmsg/base - { role: "manage-container-images", - cert_dest_dir: "/etc/docker/certs.d/registry{{ env_suffix }}.fedoraproject.org", + cert_dest_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org", cert_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.pem", key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key", + when: env == "staging" } - { role: "manage-container-images", - cert_dest_dir: "/etc/docker/certs.d/candidate-registry{{ env_suffix }}.fedoraproject.org", + cert_dest_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org", cert_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.pem", key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key", + when: env == "staging" }