From 7a4c2b964fd8f09b0331cd4cc5ada42b0b44331d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 Sep 2015 19:37:23 +0000 Subject: [PATCH] Setup staging koji to allow pkgs.stg and point builders hosts files to the right place. Hopefully will get official builds working right there in staging --- .../hosts/files/arm01-builder22.arm.fedoraproject.org-hosts | 1 + .../hosts/files/arm01-builder23.arm.fedoraproject.org-hosts | 1 + .../hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts | 1 + roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts | 1 + roles/koji_builder/templates/kojid.conf | 5 +++++ 5 files changed, 9 insertions(+) diff --git a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts index f1dc5acd24..180a003d21 100644 --- a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts @@ -12,3 +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 diff --git a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts index f1dc5acd24..180a003d21 100644 --- a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts @@ -12,3 +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 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 f1dc5acd24..180a003d21 100644 --- a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts @@ -12,3 +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 diff --git a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts index 11866acd44..e1cc9b4968 100644 --- a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts @@ -12,3 +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 diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 9bb9a29dc1..76833a31ab 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -43,8 +43,13 @@ 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