From 16d5eaf817a2fd1a7dc2427d06f34ddfcad935af Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 Sep 2015 20:09:38 +0000 Subject: [PATCH] Lets try this a different way. --- .../hosts/files/arm01-builder22.arm.fedoraproject.org-hosts | 2 +- .../hosts/files/arm01-builder23.arm.fedoraproject.org-hosts | 2 +- .../hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts | 2 +- roles/koji_builder/templates/kojid.conf | 5 ----- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts index 180a003d21..f1808c946a 100644 --- a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts @@ -12,4 +12,4 @@ 10.5.126.204 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.87 koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org kojipkgs.fedoraproject.org -10.5.126.83 pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org +10.5.126.83 pkgs.fedoraproject.org pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org diff --git a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts index 180a003d21..f1808c946a 100644 --- a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts @@ -12,4 +12,4 @@ 10.5.126.204 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.87 koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org kojipkgs.fedoraproject.org -10.5.126.83 pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org +10.5.126.83 pkgs.fedoraproject.org pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org diff --git a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts index 180a003d21..f1808c946a 100644 --- a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts @@ -12,4 +12,4 @@ 10.5.126.204 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.87 koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org kojipkgs.fedoraproject.org -10.5.126.83 pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org +10.5.126.83 pkgs.fedoraproject.org pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org diff --git a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts index e1cc9b4968..abd522bc3e 100644 --- a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts @@ -12,4 +12,4 @@ 10.5.126.204 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest 10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all 10.5.126.87 koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org kojipkgs.fedoraproject.org -10.5.126.83 pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org +10.5.126.83 pkgs.fedoraproject.org pkgs.stg.fedoraproject.org pkgs01.stg.phx2.fedoraproject.org diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 76833a31ab..9bb9a29dc1 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -43,13 +43,8 @@ server={{koji_server_url}} pkgurl=http://kojipkgs.stg.fedoraproject.org/packages {% endif %} -{% if env == 'staging' %} -; A space-separated list of hostname:repository pairs that kojid is authorized to checkout from (no quotes) -allowed_scms=pkgs.stg.fedoraproject.org:/*:false:fedpkg,sources git.fedorahosted.org:/git/spin-kickstarts.git:false -{% else %} ; A space-separated list of hostname:repository pairs that kojid is authorized to checkout from (no quotes) allowed_scms=pkgs.fedoraproject.org:/*:false:fedpkg,sources git.fedorahosted.org:/git/spin-kickstarts.git:false -{% endif %} ; The mail host to use for sending email notifications smtphost=bastion.phx2.fedoraproject.org