From 740a155fb1c23cfd54fe8112d5432bd7f426ad98 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 6 Nov 2014 18:55:40 +0000 Subject: Fold files/releng/ into roles/releng/files/ --- files/releng/branched | 3 - files/releng/fedmsg/base.py | 20 ----- files/releng/fedmsg/endpoints.py | 89 ---------------------- files/releng/fedmsg/ircbot.py | 18 ----- files/releng/fedmsg/ssl.py | 65 ---------------- files/releng/fedora-branched-compose-armhfp.cfg | 41 ---------- files/releng/fedora-branched-compose-i386.cfg | 41 ---------- files/releng/fedora-branched-compose-x86_64.cfg | 41 ---------- files/releng/fedora-branched-pungi-i386.cfg | 31 -------- files/releng/fedora-branched-pungi-x86_64.cfg | 34 --------- files/releng/fedora-devel-pungi-ppc.cfg | 32 -------- files/releng/fedora-rawhide-compose-armhfp.cfg | 40 ---------- files/releng/fedora-rawhide-compose-i386.cfg | 40 ---------- files/releng/fedora-rawhide-compose-x86_64.cfg | 40 ---------- files/releng/fedora-rawhide-pungi-i386.cfg | 33 -------- files/releng/fedora-rawhide-pungi-x86_64.cfg | 36 --------- files/releng/mash/masher.config | 2 - files/releng/mash/masher.id_rsa.pub | 1 - files/releng/rawhide | 3 - files/releng/update-fullfilelist | 20 ----- roles/releng/files/branched | 3 + roles/releng/files/fedmsg/base.py | 20 +++++ roles/releng/files/fedmsg/endpoints.py | 89 ++++++++++++++++++++++ roles/releng/files/fedmsg/ircbot.py | 18 +++++ roles/releng/files/fedmsg/ssl.py | 65 ++++++++++++++++ .../files/fedora-branched-compose-armhfp.cfg | 41 ++++++++++ .../releng/files/fedora-branched-compose-i386.cfg | 41 ++++++++++ .../files/fedora-branched-compose-x86_64.cfg | 41 ++++++++++ roles/releng/files/fedora-branched-pungi-i386.cfg | 31 ++++++++ .../releng/files/fedora-branched-pungi-x86_64.cfg | 34 +++++++++ roles/releng/files/fedora-devel-pungi-ppc.cfg | 32 ++++++++ .../releng/files/fedora-rawhide-compose-armhfp.cfg | 40 ++++++++++ roles/releng/files/fedora-rawhide-compose-i386.cfg | 40 ++++++++++ .../releng/files/fedora-rawhide-compose-x86_64.cfg | 40 ++++++++++ roles/releng/files/fedora-rawhide-pungi-i386.cfg | 33 ++++++++ roles/releng/files/fedora-rawhide-pungi-x86_64.cfg | 36 +++++++++ roles/releng/files/mash/masher.config | 2 + roles/releng/files/mash/masher.id_rsa.pub | 1 + roles/releng/files/rawhide | 3 + roles/releng/files/update-fullfilelist | 20 +++++ roles/releng/tasks/main.yml | 10 +-- 41 files changed, 635 insertions(+), 635 deletions(-) delete mode 100644 files/releng/branched delete mode 100644 files/releng/fedmsg/base.py delete mode 100644 files/releng/fedmsg/endpoints.py delete mode 100644 files/releng/fedmsg/ircbot.py delete mode 100644 files/releng/fedmsg/ssl.py delete mode 100644 files/releng/fedora-branched-compose-armhfp.cfg delete mode 100644 files/releng/fedora-branched-compose-i386.cfg delete mode 100644 files/releng/fedora-branched-compose-x86_64.cfg delete mode 100644 files/releng/fedora-branched-pungi-i386.cfg delete mode 100644 files/releng/fedora-branched-pungi-x86_64.cfg delete mode 100644 files/releng/fedora-devel-pungi-ppc.cfg delete mode 100644 files/releng/fedora-rawhide-compose-armhfp.cfg delete mode 100644 files/releng/fedora-rawhide-compose-i386.cfg delete mode 100644 files/releng/fedora-rawhide-compose-x86_64.cfg delete mode 100644 files/releng/fedora-rawhide-pungi-i386.cfg delete mode 100644 files/releng/fedora-rawhide-pungi-x86_64.cfg delete mode 100644 files/releng/mash/masher.config delete mode 100644 files/releng/mash/masher.id_rsa.pub delete mode 100644 files/releng/rawhide delete mode 100755 files/releng/update-fullfilelist create mode 100644 roles/releng/files/branched create mode 100644 roles/releng/files/fedmsg/base.py create mode 100644 roles/releng/files/fedmsg/endpoints.py create mode 100644 roles/releng/files/fedmsg/ircbot.py create mode 100644 roles/releng/files/fedmsg/ssl.py create mode 100644 roles/releng/files/fedora-branched-compose-armhfp.cfg create mode 100644 roles/releng/files/fedora-branched-compose-i386.cfg create mode 100644 roles/releng/files/fedora-branched-compose-x86_64.cfg create mode 100644 roles/releng/files/fedora-branched-pungi-i386.cfg create mode 100644 roles/releng/files/fedora-branched-pungi-x86_64.cfg create mode 100644 roles/releng/files/fedora-devel-pungi-ppc.cfg create mode 100644 roles/releng/files/fedora-rawhide-compose-armhfp.cfg create mode 100644 roles/releng/files/fedora-rawhide-compose-i386.cfg create mode 100644 roles/releng/files/fedora-rawhide-compose-x86_64.cfg create mode 100644 roles/releng/files/fedora-rawhide-pungi-i386.cfg create mode 100644 roles/releng/files/fedora-rawhide-pungi-x86_64.cfg create mode 100644 roles/releng/files/mash/masher.config create mode 100644 roles/releng/files/mash/masher.id_rsa.pub create mode 100644 roles/releng/files/rawhide create mode 100755 roles/releng/files/update-fullfilelist diff --git a/files/releng/branched b/files/releng/branched deleted file mode 100644 index f642d0f41..000000000 --- a/files/releng/branched +++ /dev/null @@ -1,3 +0,0 @@ -# branched compose -MAILTO=releng-cron@lists.fedoraproject.org -15 7 * * * masher TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/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 diff --git a/files/releng/fedmsg/base.py b/files/releng/fedmsg/base.py deleted file mode 100644 index 00d391a16..000000000 --- a/files/releng/fedmsg/base.py +++ /dev/null @@ -1,20 +0,0 @@ - -config = dict( - # Set this to dev if you're hacking on fedmsg or an app locally. - # Set to stg or prod if running in the Fedora Infrastructure. - environment="prod", - - # Default is 0 - high_water_mark=0, - io_threads=1, - - # We almost always want the fedmsg-hub to be sending messages with zmq as - # opposed to amqp or stomp. The only exception will be the bugzilla - # amqp<->zmq bridge service. - zmq_enabled=True, - - # When subscribing to messages, we want to allow splats ('*') so we tell the - # hub to not be strict when comparing messages topics to subscription - # topics. - zmq_strict=False, -) diff --git a/files/releng/fedmsg/endpoints.py b/files/releng/fedmsg/endpoints.py deleted file mode 100644 index d7729d78f..000000000 --- a/files/releng/fedmsg/endpoints.py +++ /dev/null @@ -1,89 +0,0 @@ -suffix = 'phx2.fedoraproject.org' -non_phx_suffix = 'fedoraproject.org' - -config = dict( - # This is a dict of possible addresses from which fedmsg can send - # messages. fedmsg.init(...) requires that a 'name' argument be passed - # to it which corresponds with one of the keys in this dict. - endpoints = { - # This is the output side of the relay to which all other - # services can listen. - "relay_outbound": [ - "tcp://busgateway01.%s:3999" % suffix, - ], - - # For other, more 'normal' services, fedmsg will try to guess the - # name of it's calling module to determine which endpoint definition - # to use. This can be overridden by explicitly providing the name in - # the initial call to fedmsg.init(...). - "bodhi.app01": [ - "tcp://app01.%s:300%i" % (suffix, i) - for i in range(8) - ], - "bodhi.app02": [ - "tcp://app02.%s:300%i" % (suffix, i) - for i in range(8) - ], - "bodhi.branched-composer": [ - "tcp://branched-composer.%s:3000" % suffix - ], - "bodhi.rawhide-composer": [ - "tcp://rawhide-composer.%s:3000" % suffix - ], - "bodhi.app03": [ - "tcp://app03.%s:300%i" % (suffix, i) - for i in range(8) - ], - "bodhi.app04": [ - "tcp://app04.%s:300%i" % (suffix, i) - for i in range(8) - ], - "bodhi.app05": [ - "tcp://app05.%s:300%i" % (non_phx_suffix, i) - for i in range(8) - ], - "bodhi.app07": [ - "tcp://app07.%s:300%i" % (suffix, i) - for i in range(8) - ], - "bodhi.app08": [ - "tcp://app08.%s:300%i" % (non_phx_suffix, i) - for i in range(8) - ], - "bodhi.releng04": [ - "tcp://releng04.%s:3000" % suffix - ], - "bodhi.relepel01": [ - "tcp://relepel01.%s:3000" % suffix - ], - "fas.fas01": [ - "tcp://fas01.%s:300%i" % (suffix, i) - for i in range(8) - ], - "fedoratagger.tagger01": [ - "tcp://tagger01.%s:300%i" % (suffix, i) - for i in range(8) - ], - "fedoratagger.tagger02": [ - "tcp://tagger02.%s:300%i" % (suffix, i) - for i in range(8) - ], - "busmon.app01": [ - "tcp://app01.%s:3008" % suffix, - ], - "busmon.app02": [ - "tcp://app02.%s:3008" % suffix, - ], - "supybot.value03": [ - "tcp://value03.%s:3000" % suffix, - ], - }, - - # This is the address of an active->passive relay. It is used for the - # fedmsg-logger command which requires another service with a stable - # listening address for it to send messages to. - # It is also used by the git-hook, for the same reason. - # It is also used by the mediawiki php plugin which, due to the oddities of - # php, can't maintain a single passive-bind endpoint of it's own. - relay_inbound="tcp://busgateway01.%s:9941" % suffix, -) diff --git a/files/releng/fedmsg/ircbot.py b/files/releng/fedmsg/ircbot.py deleted file mode 100644 index 44e35679e..000000000 --- a/files/releng/fedmsg/ircbot.py +++ /dev/null @@ -1,18 +0,0 @@ -config = dict( - irc=[ - dict( - network='irc.freenode.net', - port=6667, - nickname='fedmsg-bot', - channel='fedora-fedmsg', - make_pretty=True, - make_terse=True, - # Don't show busmon or the heartbeat... gross. - # any httpd topics would also be a huge source of spam. - filters=dict( - topic=['busmon', 'httpd'], - body=['lub-dub'], - ), - ), - ], -) diff --git a/files/releng/fedmsg/ssl.py b/files/releng/fedmsg/ssl.py deleted file mode 100644 index 721fb2504..000000000 --- a/files/releng/fedmsg/ssl.py +++ /dev/null @@ -1,65 +0,0 @@ - -suffix = "phx2.fedoraproject.org" -app_hosts = [ - "app01.phx2.fedoraproject.org", - "app02.phx2.fedoraproject.org", - "app03.phx2.fedoraproject.org", - "app04.phx2.fedoraproject.org", - "app05.fedoraproject.org", - "app07.phx2.fedoraproject.org", - "app08.fedoraproject.org", -] - -config = dict( - sign_messages=True, - validate_signatures=False, - ssldir="/etc/pki/fedmsg", - - crl_location="https://fedoraproject.org/fedmsg/crl.pem", - crl_cache="/var/run/fedmsg/crl.pem", - crl_cache_expiry=86400, # Daily - - certnames=dict( - [ - ("shell.app0%i" % i, "shell-%s" % app_hosts[i-1]) - for i in range(1, len(app_hosts) + 1) - ] + [ - ("bodhi.app0%i" % i, "bodhi-%s" % app_hosts[i-1]) - for i in range(1, len(app_hosts) + 1) - ] + [ - ("mediawiki.app0%i" % i, "mediawiki-%s" % app_hosts[i-1]) - for i in range(1, len(app_hosts) + 1) - ] + [ - ("shell.fas0%i" % i, "shell-fas0%i.%s" % (i, suffix)) - for i in range(1, 4) - ] + [ - ("fas.fas0%i" % i, "fas-fas0%i.%s" % (i, suffix)) - for i in range(1, 4) - ] + [ - ("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("fedoratagger.packages0%i" % i, "fedoratagger-packages0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("shell.pkgs0%i" % i, "shell-pkgs0%i.%s" % (i, suffix)) - for i in range(1, 2) - ] + [ - ("scm.pkgs0%i" % i, "scm-pkgs0%i.%s" % (i, suffix)) - for i in range(1, 2) - ] + [ - ("shell.relepel01", "shell-relepel01.%s" % suffix), - ("shell.releng04", "shell-releng04.%s" % suffix), - ("shell.branched-composer", "shell-releng01.%s" % suffix), - ("shell.rawhide-composer", "shell-releng02.%s" % suffix), - ("bodhi.relepel01", "bodhi-relepel01.%s" % suffix), - ("bodhi.releng04", "bodhi-releng04.%s" % suffix), - ("bodhi.branched-composer", "bodhi-releng01.%s" % suffix), - ("bodhi.rawhide-composer", "bodhi-releng02.%s" % suffix), - ] + [ - ("shell.value01", "shell-value01.%s" % suffix), - ("shell.value03", "shell-value03.%s" % suffix), - ("supybot.value03", "supybot-value03.%s" % suffix), - ]) -) - diff --git a/files/releng/fedora-branched-compose-armhfp.cfg b/files/releng/fedora-branched-compose-armhfp.cfg deleted file mode 100644 index 53bd79d96..000000000 --- a/files/releng/fedora-branched-compose-armhfp.cfg +++ /dev/null @@ -1,41 +0,0 @@ -config_opts['root'] = 'fedora-branched-compose-armhfp' -config_opts['target_arch'] = 'armv7hl' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - - -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/armhfp/os -enabled=1 -cost=5000 - -[static] -name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/armhfp -enabled=1 -#cost=2000 -""" - - - diff --git a/files/releng/fedora-branched-compose-i386.cfg b/files/releng/fedora-branched-compose-i386.cfg deleted file mode 100644 index aa4a88682..000000000 --- a/files/releng/fedora-branched-compose-i386.cfg +++ /dev/null @@ -1,41 +0,0 @@ -config_opts['root'] = 'fedora-branched-compose-i386' -config_opts['target_arch'] = 'i386' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - - -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/f21-build/latest/i386 -enabled=1 -#cost=2000 -""" - - - diff --git a/files/releng/fedora-branched-compose-x86_64.cfg b/files/releng/fedora-branched-compose-x86_64.cfg deleted file mode 100644 index f183c923a..000000000 --- a/files/releng/fedora-branched-compose-x86_64.cfg +++ /dev/null @@ -1,41 +0,0 @@ -config_opts['root'] = 'fedora-branched-compose-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - - -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/x86_64/os -enabled=1 -cost=5000 - -[static] -name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64 -enabled=1 -#cost=2000 -""" - - - diff --git a/files/releng/fedora-branched-pungi-i386.cfg b/files/releng/fedora-branched-pungi-i386.cfg deleted file mode 100644 index 28ce56070..000000000 --- a/files/releng/fedora-branched-pungi-i386.cfg +++ /dev/null @@ -1,31 +0,0 @@ -config_opts['root'] = 'fedora-branched-pungi-i386' -config_opts['target_arch'] = 'i386' -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 - -[fedora] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os - -[buildroot] -name=buildroot -baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/ -""" diff --git a/files/releng/fedora-branched-pungi-x86_64.cfg b/files/releng/fedora-branched-pungi-x86_64.cfg deleted file mode 100644 index d6b9a892a..000000000 --- a/files/releng/fedora-branched-pungi-x86_64.cfg +++ /dev/null @@ -1,34 +0,0 @@ -config_opts['root'] = 'fedora-branched-pungi-x86_64' -config_opts['target_arch'] = 'x86_64' -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 -# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all -# .i?86 packages except these. -exclude=[!g]*.i*86 g[!l]*.i?86 gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86 - -# repos - -[fedora] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os - -[buildroot] -name=buildroot -baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/ -""" diff --git a/files/releng/fedora-devel-pungi-ppc.cfg b/files/releng/fedora-devel-pungi-ppc.cfg deleted file mode 100644 index b1c58b94e..000000000 --- a/files/releng/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 -""" diff --git a/files/releng/fedora-rawhide-compose-armhfp.cfg b/files/releng/fedora-rawhide-compose-armhfp.cfg deleted file mode 100644 index 2fc304b49..000000000 --- a/files/releng/fedora-rawhide-compose-armhfp.cfg +++ /dev/null @@ -1,40 +0,0 @@ -config_opts['root'] = 'fedora-rawhide-compose-armhfp' -config_opts['target_arch'] = 'armv7hl' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools' -config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - -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/rawhide/armhfp/os -enabled=1 -cost=5000 - -[static] -name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/armhfp -enabled=1 -#cost=2000 -""" - - - diff --git a/files/releng/fedora-rawhide-compose-i386.cfg b/files/releng/fedora-rawhide-compose-i386.cfg deleted file mode 100644 index 410f458f3..000000000 --- a/files/releng/fedora-rawhide-compose-i386.cfg +++ /dev/null @@ -1,40 +0,0 @@ -config_opts['root'] = 'fedora-rawhide-compose-i386' -config_opts['target_arch'] = 'i386' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - -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/rawhide/i386/os -enabled=1 -cost=5000 - -[static] -name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/i386 -enabled=1 -#cost=2000 -""" - - - diff --git a/files/releng/fedora-rawhide-compose-x86_64.cfg b/files/releng/fedora-rawhide-compose-x86_64.cfg deleted file mode 100644 index c20a4d670..000000000 --- a/files/releng/fedora-rawhide-compose-x86_64.cfg +++ /dev/null @@ -1,40 +0,0 @@ -config_opts['root'] = 'fedora-rawhide-compose-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - -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/rawhide/x86_64/os -enabled=1 -cost=5000 - -[static] -name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64 -enabled=1 -#cost=2000 -""" - - - diff --git a/files/releng/fedora-rawhide-pungi-i386.cfg b/files/releng/fedora-rawhide-pungi-i386.cfg deleted file mode 100644 index 0dfc72692..000000000 --- a/files/releng/fedora-rawhide-pungi-i386.cfg +++ /dev/null @@ -1,33 +0,0 @@ -config_opts['root'] = 'fedora-rawhide-pungi-i386' -config_opts['target_arch'] = 'i386' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - -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 - -[fedora] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os - -[buildroot] -name=buildroot -baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/ -""" diff --git a/files/releng/fedora-rawhide-pungi-x86_64.cfg b/files/releng/fedora-rawhide-pungi-x86_64.cfg deleted file mode 100644 index 333e10fc5..000000000 --- a/files/releng/fedora-rawhide-pungi-x86_64.cfg +++ /dev/null @@ -1,36 +0,0 @@ -config_opts['root'] = 'fedora-rawhide-pungi-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst -config_opts['plugin_conf']['root_cache_enable'] = False -config_opts['internal_dev_setup'] = False -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) - -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 -# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all -# .i?86 packages except these. -exclude=[!g]*.i*86 g[!l]*.i?86 gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86 - -# repos - -[fedora] -name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os - -[buildroot] -name=buildroot -baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/ -""" diff --git a/files/releng/mash/masher.config b/files/releng/mash/masher.config deleted file mode 100644 index f30d239b6..000000000 --- a/files/releng/mash/masher.config +++ /dev/null @@ -1,2 +0,0 @@ -Host * - StrictHostKeyChecking no diff --git a/files/releng/mash/masher.id_rsa.pub b/files/releng/mash/masher.id_rsa.pub deleted file mode 100644 index 88bea80ac..000000000 --- a/files/releng/mash/masher.id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -from="10.5.125.64,10.5.125.66,10.5.125.69,10.5.125.68" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA8qg9fzb6pbl15hUdIB8vcUIIK4LcoY30iwL/eJ/8PJRtWc0MJloAfhjGGmmgf7sJl5Lt5VGoZqBw5x1thUfLpxN6FasEQnAnjsBCJM3dfF3OybOtdMAX7+2f29V4xJ+r1djdJnBM7FeXQ6zDFLAmGjFF4flUNmKa0PPmHjJqXWPoLvQq3mLWTCkscanWEA2WL+ceQ/0Bac3ZuHJQ7yPY+lD3p/hHTnQlito+rJVItGzLTkSxmiZaS3UwUSkxPBB3Tms8e7coALaY3AM9K91mnFi0oFFW+pCPdccjBUfHuzT6Khx0SrbKVUI57riUZs2+FDLiBSST7OT8nDlIgBwMWiwfjgURfvp5HOh46hc3gb0+DCxScXlocRMs6a47rC/EACN7HB4HjbrvBbfQts3GegU67Ia7d3vgDNRknp1sR/RjhYeTPxFAPqXJN5/hFyuHyFYTjavw0BZpSvZvQHgAVvUIZsHwEshvlwFkMU5qnqgnR6oMJxlZHqYw63K3iKeUsKsFJepSV5xb+r9pTtHL/bmsTuaEaPhUOiW4kgq8E0RQ5K20FERFsGNCEgfMoAOnLYYQX0vaYIemnGHTA0Y4bqgo39opVBj7dKipVp3uENmxeYTBSQJ9pRJhlmQxxfk0AupQbs77+K9dSLvMo0E10gHK3fa8r1FigAA4T/IDtLs= masher@releng2.fedora.phx.redhat.com diff --git a/files/releng/rawhide b/files/releng/rawhide deleted file mode 100644 index 679b4a784..000000000 --- a/files/releng/rawhide +++ /dev/null @@ -1,3 +0,0 @@ -# rawhide compose -MAILTO=releng-cron@lists.fedoraproject.org -15 5 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildrawhide $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora diff --git a/files/releng/update-fullfilelist b/files/releng/update-fullfilelist deleted file mode 100755 index 0302c6a5b..000000000 --- a/files/releng/update-fullfilelist +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# currently runs on releng2.fedora.phx.redhat.com - -MOD=$1 -[ -z "$MOD" ] && { - echo "usage: $0 " - exit 1 -} - -TMPFILE=$(mktemp -p /tmp/) -pushd /pub/$MOD > /dev/null -find * -print > $TMPFILE -if diff $TMPFILE fullfilelist > /dev/null; then - rm -f $TMPFILE -else - mv $TMPFILE fullfilelist -fi -chmod 0644 fullfilelist -popd > /dev/null diff --git a/roles/releng/files/branched b/roles/releng/files/branched new file mode 100644 index 000000000..f642d0f41 --- /dev/null +++ b/roles/releng/files/branched @@ -0,0 +1,3 @@ +# branched compose +MAILTO=releng-cron@lists.fedoraproject.org +15 7 * * * masher TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/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 diff --git a/roles/releng/files/fedmsg/base.py b/roles/releng/files/fedmsg/base.py new file mode 100644 index 000000000..00d391a16 --- /dev/null +++ b/roles/releng/files/fedmsg/base.py @@ -0,0 +1,20 @@ + +config = dict( + # Set this to dev if you're hacking on fedmsg or an app locally. + # Set to stg or prod if running in the Fedora Infrastructure. + environment="prod", + + # Default is 0 + high_water_mark=0, + io_threads=1, + + # We almost always want the fedmsg-hub to be sending messages with zmq as + # opposed to amqp or stomp. The only exception will be the bugzilla + # amqp<->zmq bridge service. + zmq_enabled=True, + + # When subscribing to messages, we want to allow splats ('*') so we tell the + # hub to not be strict when comparing messages topics to subscription + # topics. + zmq_strict=False, +) diff --git a/roles/releng/files/fedmsg/endpoints.py b/roles/releng/files/fedmsg/endpoints.py new file mode 100644 index 000000000..d7729d78f --- /dev/null +++ b/roles/releng/files/fedmsg/endpoints.py @@ -0,0 +1,89 @@ +suffix = 'phx2.fedoraproject.org' +non_phx_suffix = 'fedoraproject.org' + +config = dict( + # This is a dict of possible addresses from which fedmsg can send + # messages. fedmsg.init(...) requires that a 'name' argument be passed + # to it which corresponds with one of the keys in this dict. + endpoints = { + # This is the output side of the relay to which all other + # services can listen. + "relay_outbound": [ + "tcp://busgateway01.%s:3999" % suffix, + ], + + # For other, more 'normal' services, fedmsg will try to guess the + # name of it's calling module to determine which endpoint definition + # to use. This can be overridden by explicitly providing the name in + # the initial call to fedmsg.init(...). + "bodhi.app01": [ + "tcp://app01.%s:300%i" % (suffix, i) + for i in range(8) + ], + "bodhi.app02": [ + "tcp://app02.%s:300%i" % (suffix, i) + for i in range(8) + ], + "bodhi.branched-composer": [ + "tcp://branched-composer.%s:3000" % suffix + ], + "bodhi.rawhide-composer": [ + "tcp://rawhide-composer.%s:3000" % suffix + ], + "bodhi.app03": [ + "tcp://app03.%s:300%i" % (suffix, i) + for i in range(8) + ], + "bodhi.app04": [ + "tcp://app04.%s:300%i" % (suffix, i) + for i in range(8) + ], + "bodhi.app05": [ + "tcp://app05.%s:300%i" % (non_phx_suffix, i) + for i in range(8) + ], + "bodhi.app07": [ + "tcp://app07.%s:300%i" % (suffix, i) + for i in range(8) + ], + "bodhi.app08": [ + "tcp://app08.%s:300%i" % (non_phx_suffix, i) + for i in range(8) + ], + "bodhi.releng04": [ + "tcp://releng04.%s:3000" % suffix + ], + "bodhi.relepel01": [ + "tcp://relepel01.%s:3000" % suffix + ], + "fas.fas01": [ + "tcp://fas01.%s:300%i" % (suffix, i) + for i in range(8) + ], + "fedoratagger.tagger01": [ + "tcp://tagger01.%s:300%i" % (suffix, i) + for i in range(8) + ], + "fedoratagger.tagger02": [ + "tcp://tagger02.%s:300%i" % (suffix, i) + for i in range(8) + ], + "busmon.app01": [ + "tcp://app01.%s:3008" % suffix, + ], + "busmon.app02": [ + "tcp://app02.%s:3008" % suffix, + ], + "supybot.value03": [ + "tcp://value03.%s:3000" % suffix, + ], + }, + + # This is the address of an active->passive relay. It is used for the + # fedmsg-logger command which requires another service with a stable + # listening address for it to send messages to. + # It is also used by the git-hook, for the same reason. + # It is also used by the mediawiki php plugin which, due to the oddities of + # php, can't maintain a single passive-bind endpoint of it's own. + relay_inbound="tcp://busgateway01.%s:9941" % suffix, +) diff --git a/roles/releng/files/fedmsg/ircbot.py b/roles/releng/files/fedmsg/ircbot.py new file mode 100644 index 000000000..44e35679e --- /dev/null +++ b/roles/releng/files/fedmsg/ircbot.py @@ -0,0 +1,18 @@ +config = dict( + irc=[ + dict( + network='irc.freenode.net', + port=6667, + nickname='fedmsg-bot', + channel='fedora-fedmsg', + make_pretty=True, + make_terse=True, + # Don't show busmon or the heartbeat... gross. + # any httpd topics would also be a huge source of spam. + filters=dict( + topic=['busmon', 'httpd'], + body=['lub-dub'], + ), + ), + ], +) diff --git a/roles/releng/files/fedmsg/ssl.py b/roles/releng/files/fedmsg/ssl.py new file mode 100644 index 000000000..721fb2504 --- /dev/null +++ b/roles/releng/files/fedmsg/ssl.py @@ -0,0 +1,65 @@ + +suffix = "phx2.fedoraproject.org" +app_hosts = [ + "app01.phx2.fedoraproject.org", + "app02.phx2.fedoraproject.org", + "app03.phx2.fedoraproject.org", + "app04.phx2.fedoraproject.org", + "app05.fedoraproject.org", + "app07.phx2.fedoraproject.org", + "app08.fedoraproject.org", +] + +config = dict( + sign_messages=True, + validate_signatures=False, + ssldir="/etc/pki/fedmsg", + + crl_location="https://fedoraproject.org/fedmsg/crl.pem", + crl_cache="/var/run/fedmsg/crl.pem", + crl_cache_expiry=86400, # Daily + + certnames=dict( + [ + ("shell.app0%i" % i, "shell-%s" % app_hosts[i-1]) + for i in range(1, len(app_hosts) + 1) + ] + [ + ("bodhi.app0%i" % i, "bodhi-%s" % app_hosts[i-1]) + for i in range(1, len(app_hosts) + 1) + ] + [ + ("mediawiki.app0%i" % i, "mediawiki-%s" % app_hosts[i-1]) + for i in range(1, len(app_hosts) + 1) + ] + [ + ("shell.fas0%i" % i, "shell-fas0%i.%s" % (i, suffix)) + for i in range(1, 4) + ] + [ + ("fas.fas0%i" % i, "fas-fas0%i.%s" % (i, suffix)) + for i in range(1, 4) + ] + [ + ("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix)) + for i in range(1, 3) + ] + [ + ("fedoratagger.packages0%i" % i, "fedoratagger-packages0%i.%s" % (i, suffix)) + for i in range(1, 3) + ] + [ + ("shell.pkgs0%i" % i, "shell-pkgs0%i.%s" % (i, suffix)) + for i in range(1, 2) + ] + [ + ("scm.pkgs0%i" % i, "scm-pkgs0%i.%s" % (i, suffix)) + for i in range(1, 2) + ] + [ + ("shell.relepel01", "shell-relepel01.%s" % suffix), + ("shell.releng04", "shell-releng04.%s" % suffix), + ("shell.branched-composer", "shell-releng01.%s" % suffix), + ("shell.rawhide-composer", "shell-releng02.%s" % suffix), + ("bodhi.relepel01", "bodhi-relepel01.%s" % suffix), + ("bodhi.releng04", "bodhi-releng04.%s" % suffix), + ("bodhi.branched-composer", "bodhi-releng01.%s" % suffix), + ("bodhi.rawhide-composer", "bodhi-releng02.%s" % suffix), + ] + [ + ("shell.value01", "shell-value01.%s" % suffix), + ("shell.value03", "shell-value03.%s" % suffix), + ("supybot.value03", "supybot-value03.%s" % suffix), + ]) +) + diff --git a/roles/releng/files/fedora-branched-compose-armhfp.cfg b/roles/releng/files/fedora-branched-compose-armhfp.cfg new file mode 100644 index 000000000..53bd79d96 --- /dev/null +++ b/roles/releng/files/fedora-branched-compose-armhfp.cfg @@ -0,0 +1,41 @@ +config_opts['root'] = 'fedora-branched-compose-armhfp' +config_opts['target_arch'] = 'armv7hl' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools' +config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + + +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/armhfp/os +enabled=1 +cost=5000 + +[static] +name=static +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/armhfp +enabled=1 +#cost=2000 +""" + + + diff --git a/roles/releng/files/fedora-branched-compose-i386.cfg b/roles/releng/files/fedora-branched-compose-i386.cfg new file mode 100644 index 000000000..aa4a88682 --- /dev/null +++ b/roles/releng/files/fedora-branched-compose-i386.cfg @@ -0,0 +1,41 @@ +config_opts['root'] = 'fedora-branched-compose-i386' +config_opts['target_arch'] = 'i386' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' +config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + + +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/f21-build/latest/i386 +enabled=1 +#cost=2000 +""" + + + diff --git a/roles/releng/files/fedora-branched-compose-x86_64.cfg b/roles/releng/files/fedora-branched-compose-x86_64.cfg new file mode 100644 index 000000000..f183c923a --- /dev/null +++ b/roles/releng/files/fedora-branched-compose-x86_64.cfg @@ -0,0 +1,41 @@ +config_opts['root'] = 'fedora-branched-compose-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' +config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + + +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/x86_64/os +enabled=1 +cost=5000 + +[static] +name=static +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64 +enabled=1 +#cost=2000 +""" + + + diff --git a/roles/releng/files/fedora-branched-pungi-i386.cfg b/roles/releng/files/fedora-branched-pungi-i386.cfg new file mode 100644 index 000000000..28ce56070 --- /dev/null +++ b/roles/releng/files/fedora-branched-pungi-i386.cfg @@ -0,0 +1,31 @@ +config_opts['root'] = 'fedora-branched-pungi-i386' +config_opts['target_arch'] = 'i386' +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 + +[fedora] +name=fedora +baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os + +[buildroot] +name=buildroot +baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/ +""" diff --git a/roles/releng/files/fedora-branched-pungi-x86_64.cfg b/roles/releng/files/fedora-branched-pungi-x86_64.cfg new file mode 100644 index 000000000..d6b9a892a --- /dev/null +++ b/roles/releng/files/fedora-branched-pungi-x86_64.cfg @@ -0,0 +1,34 @@ +config_opts['root'] = 'fedora-branched-pungi-x86_64' +config_opts['target_arch'] = 'x86_64' +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 +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +exclude=[!g]*.i*86 g[!l]*.i?86 gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86 + +# repos + +[fedora] +name=fedora +baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os + +[buildroot] +name=buildroot +baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/ +""" diff --git a/roles/releng/files/fedora-devel-pungi-ppc.cfg b/roles/releng/files/fedora-devel-pungi-ppc.cfg new file mode 100644 index 000000000..b1c58b94e --- /dev/null +++ b/roles/releng/files/fedora-devel-pungi-ppc.cfg @@ -0,0 +1,32 @@ +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 +""" diff --git a/roles/releng/files/fedora-rawhide-compose-armhfp.cfg b/roles/releng/files/fedora-rawhide-compose-armhfp.cfg new file mode 100644 index 000000000..2fc304b49 --- /dev/null +++ b/roles/releng/files/fedora-rawhide-compose-armhfp.cfg @@ -0,0 +1,40 @@ +config_opts['root'] = 'fedora-rawhide-compose-armhfp' +config_opts['target_arch'] = 'armv7hl' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools' +config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + +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/rawhide/armhfp/os +enabled=1 +cost=5000 + +[static] +name=static +baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/armhfp +enabled=1 +#cost=2000 +""" + + + diff --git a/roles/releng/files/fedora-rawhide-compose-i386.cfg b/roles/releng/files/fedora-rawhide-compose-i386.cfg new file mode 100644 index 000000000..410f458f3 --- /dev/null +++ b/roles/releng/files/fedora-rawhide-compose-i386.cfg @@ -0,0 +1,40 @@ +config_opts['root'] = 'fedora-rawhide-compose-i386' +config_opts['target_arch'] = 'i386' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' +config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + +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/rawhide/i386/os +enabled=1 +cost=5000 + +[static] +name=static +baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/i386 +enabled=1 +#cost=2000 +""" + + + diff --git a/roles/releng/files/fedora-rawhide-compose-x86_64.cfg b/roles/releng/files/fedora-rawhide-compose-x86_64.cfg new file mode 100644 index 000000000..c20a4d670 --- /dev/null +++ b/roles/releng/files/fedora-rawhide-compose-x86_64.cfg @@ -0,0 +1,40 @@ +config_opts['root'] = 'fedora-rawhide-compose-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' +config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + +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/rawhide/x86_64/os +enabled=1 +cost=5000 + +[static] +name=static +baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64 +enabled=1 +#cost=2000 +""" + + + diff --git a/roles/releng/files/fedora-rawhide-pungi-i386.cfg b/roles/releng/files/fedora-rawhide-pungi-i386.cfg new file mode 100644 index 000000000..0dfc72692 --- /dev/null +++ b/roles/releng/files/fedora-rawhide-pungi-i386.cfg @@ -0,0 +1,33 @@ +config_opts['root'] = 'fedora-rawhide-pungi-i386' +config_opts['target_arch'] = 'i386' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' +config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + +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 + +[fedora] +name=fedora +baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os + +[buildroot] +name=buildroot +baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/ +""" diff --git a/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg b/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg new file mode 100644 index 000000000..333e10fc5 --- /dev/null +++ b/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg @@ -0,0 +1,36 @@ +config_opts['root'] = 'fedora-rawhide-pungi-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi' +config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['internal_dev_setup'] = False +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' )) +config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' )) + +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 +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +exclude=[!g]*.i*86 g[!l]*.i?86 gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86 + +# repos + +[fedora] +name=fedora +baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os + +[buildroot] +name=buildroot +baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/ +""" diff --git a/roles/releng/files/mash/masher.config b/roles/releng/files/mash/masher.config new file mode 100644 index 000000000..f30d239b6 --- /dev/null +++ b/roles/releng/files/mash/masher.config @@ -0,0 +1,2 @@ +Host * + StrictHostKeyChecking no diff --git a/roles/releng/files/mash/masher.id_rsa.pub b/roles/releng/files/mash/masher.id_rsa.pub new file mode 100644 index 000000000..88bea80ac --- /dev/null +++ b/roles/releng/files/mash/masher.id_rsa.pub @@ -0,0 +1 @@ +from="10.5.125.64,10.5.125.66,10.5.125.69,10.5.125.68" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA8qg9fzb6pbl15hUdIB8vcUIIK4LcoY30iwL/eJ/8PJRtWc0MJloAfhjGGmmgf7sJl5Lt5VGoZqBw5x1thUfLpxN6FasEQnAnjsBCJM3dfF3OybOtdMAX7+2f29V4xJ+r1djdJnBM7FeXQ6zDFLAmGjFF4flUNmKa0PPmHjJqXWPoLvQq3mLWTCkscanWEA2WL+ceQ/0Bac3ZuHJQ7yPY+lD3p/hHTnQlito+rJVItGzLTkSxmiZaS3UwUSkxPBB3Tms8e7coALaY3AM9K91mnFi0oFFW+pCPdccjBUfHuzT6Khx0SrbKVUI57riUZs2+FDLiBSST7OT8nDlIgBwMWiwfjgURfvp5HOh46hc3gb0+DCxScXlocRMs6a47rC/EACN7HB4HjbrvBbfQts3GegU67Ia7d3vgDNRknp1sR/RjhYeTPxFAPqXJN5/hFyuHyFYTjavw0BZpSvZvQHgAVvUIZsHwEshvlwFkMU5qnqgnR6oMJxlZHqYw63K3iKeUsKsFJepSV5xb+r9pTtHL/bmsTuaEaPhUOiW4kgq8E0RQ5K20FERFsGNCEgfMoAOnLYYQX0vaYIemnGHTA0Y4bqgo39opVBj7dKipVp3uENmxeYTBSQJ9pRJhlmQxxfk0AupQbs77+K9dSLvMo0E10gHK3fa8r1FigAA4T/IDtLs= masher@releng2.fedora.phx.redhat.com diff --git a/roles/releng/files/rawhide b/roles/releng/files/rawhide new file mode 100644 index 000000000..679b4a784 --- /dev/null +++ b/roles/releng/files/rawhide @@ -0,0 +1,3 @@ +# rawhide compose +MAILTO=releng-cron@lists.fedoraproject.org +15 5 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildrawhide $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora diff --git a/roles/releng/files/update-fullfilelist b/roles/releng/files/update-fullfilelist new file mode 100755 index 000000000..0302c6a5b --- /dev/null +++ b/roles/releng/files/update-fullfilelist @@ -0,0 +1,20 @@ +#!/bin/bash + +# currently runs on releng2.fedora.phx.redhat.com + +MOD=$1 +[ -z "$MOD" ] && { + echo "usage: $0 " + exit 1 +} + +TMPFILE=$(mktemp -p /tmp/) +pushd /pub/$MOD > /dev/null +find * -print > $TMPFILE +if diff $TMPFILE fullfilelist > /dev/null; then + rm -f $TMPFILE +else + mv $TMPFILE fullfilelist +fi +chmod 0644 fullfilelist +popd > /dev/null diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index 260e6e18a..e9c3444a4 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -17,7 +17,7 @@ user: name=ftpsync uid=263 group=ftpsync createhome=yes system=yes state=present - name: add the ftpsync update-fullfilelist script - action: copy src="{{ files }}/releng/update-fullfilelist" dest=/usr/local/bin/update-fullfilelist owner=ftpsync group=ftpsync mode=555 + action: copy src=update-fullfilelist dest=/usr/local/bin/update-fullfilelist owner=ftpsync group=ftpsync mode=555 - name: add masher group action: group name=masher gid=751 system=yes state=present @@ -28,7 +28,7 @@ - name: add masher ssh dir action: file state=directory path=/home/masher/.ssh mode=700 owner=masher group=masher - name: add masher ssh keys - action: copy src="{{ files }}/releng/mash/masher.{{ item }}" dest="/home/masher/.ssh/{{ item }}" mode=600 owner=masher group=masher + action: copy src="mash/masher.{{ item }}" dest="/home/masher/.ssh/{{ item }}" mode=600 owner=masher group=masher with_items: - id_rsa.pub - config @@ -83,7 +83,7 @@ # mock configs - name: put extra special mock configs in - action: copy src="{{ files }}/releng/{{ item }}" dest="/etc/mock/{{ item }}" mode=644 + action: copy src="{{ item }}" dest="/etc/mock/{{ item }}" mode=644 with_items: - fedora-branched-compose-armhfp.cfg - fedora-rawhide-compose-armhfp.cfg @@ -113,12 +113,12 @@ # put cron job in for branched compose - name: branched compose cron - action: copy src="{{ files }}/releng/branched" dest=/etc/cron.d/branched + action: copy src="branched" dest=/etc/cron.d/branched when: inventory_hostname.startswith('branched-composer') # put cron job in for rawhide compose - name: rawhide compose cron - action: copy src="{{ files }}/releng/rawhide" dest=/etc/cron.d/rawhide + action: copy src="rawhide" dest=/etc/cron.d/rawhide when: inventory_hostname.startswith('rawhide-composer') - name: sudoers defaults -- cgit