This patch set sets up releng01 to be able to compose "branched" each night. It'll require a couple changes to the sudoers file too.
-- Jes
--- .../files/mock/fedora-branched-compose-i386.cfg | 36 ++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 modules/mock/files/mock/fedora-branched-compose-i386.cfg
diff --git a/modules/mock/files/mock/fedora-branched-compose-i386.cfg b/modules/mock/files/mock/fedora-branched-compose-i386.cfg new file mode 100644 index 0000000..17017c8 --- /dev/null +++ b/modules/mock/files/mock/fedora-branched-compose-i386.cfg @@ -0,0 +1,36 @@ +config_opts['root'] = 'fedora-branched-compose-i386' +config_opts['target_arch'] = 'i386' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) +config_opts['plugin_conf']['root_cache_enable'] = False + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 + +# repos + +[fedora] +name=fedora +baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os +enabled=1 +cost=5000 + +[static] +name=static +baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/i386 +enabled=1 +#cost=2000 +""" + + +
--- .../mock/files/mock/fedora-devel-pungi-i386.cfg | 7 +------ .../mock/files/mock/fedora-devel-pungi-x86_64.cfg | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/modules/mock/files/mock/fedora-devel-pungi-i386.cfg b/modules/mock/files/mock/fedora-devel-pungi-i386.cfg index 6879e83..0f66ef3 100644 --- a/modules/mock/files/mock/fedora-devel-pungi-i386.cfg +++ b/modules/mock/files/mock/fedora-devel-pungi-i386.cfg @@ -21,12 +21,7 @@ assumeyes=1
# repos
-[static] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-rawhide/latest/i386/ -cost=2 - [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os +baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os """ diff --git a/modules/mock/files/mock/fedora-devel-pungi-x86_64.cfg b/modules/mock/files/mock/fedora-devel-pungi-x86_64.cfg index c15bc0d..83deabf 100644 --- a/modules/mock/files/mock/fedora-devel-pungi-x86_64.cfg +++ b/modules/mock/files/mock/fedora-devel-pungi-x86_64.cfg @@ -24,12 +24,7 @@ exclude=[!g]*.i*86 g[!l]*.i?86 gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86
# repos
-[static] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-rawhide/latest/x86_64/ -cost=2 - [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os +baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os """
--- modules/mock/files/mock/fedora-devel-pungi-ppc.cfg | 32 -------------------- 1 files changed, 0 insertions(+), 32 deletions(-) delete mode 100644 modules/mock/files/mock/fedora-devel-pungi-ppc.cfg
diff --git a/modules/mock/files/mock/fedora-devel-pungi-ppc.cfg b/modules/mock/files/mock/fedora-devel-pungi-ppc.cfg deleted file mode 100644 index b1c58b9..0000000 --- a/modules/mock/files/mock/fedora-devel-pungi-ppc.cfg +++ /dev/null @@ -1,32 +0,0 @@ -config_opts['root'] = 'fedora-development-pungi-ppc' -config_opts['target_arch'] = 'ppc' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc9' -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' )) - - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 - -# repos - -[static] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-rawhide/latest/ppc/ -cost=2 - -[fedora] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/ppc/os -"""
--- configs/build/branched | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) create mode 100644 configs/build/branched
diff --git a/configs/build/branched b/configs/build/branched new file mode 100644 index 0000000..aa71c75 --- /dev/null +++ b/configs/build/branched @@ -0,0 +1,3 @@ +# branched compose +MAILTO=jkeating@fedoraproject.org +15 9 * * * masher TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/git/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildbranched $(date "+%Y%m%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora
Just add the mirrormaster so we get the scripts, but not the cron jobs --- manifests/nodes/releng01.phx2.fedoraproject.org.pp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/manifests/nodes/releng01.phx2.fedoraproject.org.pp b/manifests/nodes/releng01.phx2.fedoraproject.org.pp index 4648574..0fbe7b9 100644 --- a/manifests/nodes/releng01.phx2.fedoraproject.org.pp +++ b/manifests/nodes/releng01.phx2.fedoraproject.org.pp @@ -9,6 +9,8 @@ node releng01{ include masher-user include yum::repo::releng include yum::repo::builder-infrastructure + include branchedbuilder + include mirrormaster
file { ['/pub', '/pub/fedora', '/mnt/koji']: ensure => directory
+1 from me.
-Mike
On Thu, 18 Feb 2010, Jesse Keating wrote:
This patch set sets up releng01 to be able to compose "branched" each night. It'll require a couple changes to the sudoers file too.
-- Jes
infrastructure mailing list infrastructure@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/infrastructure
+1 -- Nigel Jones
On Thu, Feb 18, 2010 at 5:07 PM, Mike McGrath mmcgrath@redhat.com wrote:
+1 from me.
-Mike
On Thu, 18 Feb 2010, Jesse Keating wrote:
This patch set sets up releng01 to be able to compose "branched" each night. It'll require a couple changes to the sudoers file too.
-- Jes
infrastructure mailing list infrastructure@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/infrastructure
infrastructure mailing list infrastructure@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/infrastructure
infrastructure@lists.fedoraproject.org