From 3374ca53c8e3fe6f3dc276997357c25ab664e246 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 9 Jan 2017 04:20:19 +0000 Subject: [PATCH 1/6] drop old autocloud-backend hw boxes --- inventory/hardware | 2 -- 1 file changed, 2 deletions(-) diff --git a/inventory/hardware b/inventory/hardware index 0cee09a396..62fd8b767c 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -67,8 +67,6 @@ bvirthost10.phx2.fedoraproject.org bvirthost11.phx2.fedoraproject.org [ibms] -autocloud-backend-libvirt.phx2.fedoraproject.org -autocloud-backend-vbox.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org ibiblio02.fedoraproject.org ibiblio03.fedoraproject.org From 3f657b21eff0ddb7216c78262963be3824924ca4 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 9 Jan 2017 10:24:22 +0100 Subject: [PATCH 2/6] copr: do not patch mock configs of eoled fedoras --- .../backend/files/provision/provision_builder_tasks.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 681ce3e87c..7cf0b7f9f3 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -71,10 +71,6 @@ regexp='^metalink=https://mirrors.fedoraproject.org/metalink\?repo=updates-released-f\$releasever&arch=\$basearch' replace='baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/' with_items: #mock_fedora_configs_to_patch.stdout_lines - - /etc/mock/fedora-22-i386.cfg - - /etc/mock/fedora-22-x86_64.cfg - - /etc/mock/fedora-23-i386.cfg - - /etc/mock/fedora-23-x86_64.cfg - /etc/mock/fedora-24-i386.cfg - /etc/mock/fedora-24-x86_64.cfg - /etc/mock/fedora-25-i386.cfg @@ -86,10 +82,6 @@ regexp='^metalink=https://mirrors.fedoraproject.org/metalink\?repo=fedora-f\$releasever&arch=\$basearch' replace='baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/' with_items: #mock_fedora_configs_to_patch.stdout_lines - - /etc/mock/fedora-22-i386.cfg - - /etc/mock/fedora-22-x86_64.cfg - - /etc/mock/fedora-23-i386.cfg - - /etc/mock/fedora-23-x86_64.cfg - /etc/mock/fedora-24-i386.cfg - /etc/mock/fedora-24-x86_64.cfg - /etc/mock/fedora-25-i386.cfg From 68b9eb2a0c6a0b8a374b7b6d68d8da6e0232c349 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 9 Jan 2017 14:39:54 +0000 Subject: [PATCH 3/6] Add f26-ruby24 for rebuild Signed-off-by: Patrick Uiterwijk --- roles/robosignatory/files/robosignatory.production.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/robosignatory/files/robosignatory.production.py b/roles/robosignatory/files/robosignatory.production.py index 90bd342003..b5dae03a6b 100644 --- a/roles/robosignatory/files/robosignatory.production.py +++ b/roles/robosignatory/files/robosignatory.production.py @@ -26,6 +26,14 @@ config = { 'keytab': '/etc/krb5.autosign_autosign01.phx2.fedoraproject.org.keytab' }, 'tags': [ + # Temporary tags for rebuilds + { + "from": "f26-ruby24", + "to": "f26-ruby24", + "key": "fedora-26", + "keyid": "64dab85d" + }, + # Normal tags { "from": "epel6-infra-candidate", "to": "epel6-infra", From 41364d1db8e4d3598de5b1011ffacc0cf723d6a0 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 9 Jan 2017 14:41:12 +0000 Subject: [PATCH 4/6] Temporarily enable autosign01 Signed-off-by: Patrick Uiterwijk --- inventory/inventory | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/inventory b/inventory/inventory index 0e2534fc92..aa97c1e4b6 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -243,7 +243,7 @@ autocloud-backend01.stg.phx2.fedoraproject.org autocloud-backend02.stg.phx2.fedoraproject.org [autosign] -#autosign01.phx2.fedoraproject.org +autosign01.phx2.fedoraproject.org [autosign-stg] autosign01.stg.phx2.fedoraproject.org From 98c27f78e80a9e7c027f402cbb561f4d3ad7809a Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 9 Jan 2017 14:45:09 +0000 Subject: [PATCH 5/6] Revert "Temporarily enable autosign01" This reverts commit 41364d1db8e4d3598de5b1011ffacc0cf723d6a0. --- inventory/inventory | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/inventory b/inventory/inventory index aa97c1e4b6..0e2534fc92 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -243,7 +243,7 @@ autocloud-backend01.stg.phx2.fedoraproject.org autocloud-backend02.stg.phx2.fedoraproject.org [autosign] -autosign01.phx2.fedoraproject.org +#autosign01.phx2.fedoraproject.org [autosign-stg] autosign01.stg.phx2.fedoraproject.org From f26069c9ab1bd8204d5aee5655ccbcdeb28cd697 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Mon, 9 Jan 2017 16:07:19 +0000 Subject: [PATCH 6/6] attempt to stg cutover to modernpaste Signed-off-by: Ricky Elrod --- playbooks/include/proxies-reverseproxy.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index a368d5e6ca..c03375d4dd 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -138,6 +138,13 @@ website: paste.fedoraproject.org destname: sticky-notes proxyurl: "{{ varnish_url }}" + when: env != "staging" + + - role: httpd/reverseproxy + website: paste.fedoraproject.org + destname: modernpaste + proxyurl: http://localhost:10055 + when: env == "staging" - role: httpd/reverseproxy website: admin.fedoraproject.org @@ -569,12 +576,6 @@ proxyurl: http://localhost:10052 when: env == "staging" - - role: httpd/reverseproxy - website: modernpaste.fedoraproject.org - destname: modernpaste - proxyurl: http://localhost:10055 - when: env == "staging" - - role: httpd/reverseproxy website: koji.fedoraproject.org destname: koji