From 187171d7904ab713acd5c78d22e28715cdc7559e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 19 Oct 2014 20:26:55 +0000 Subject: [PATCH 1/8] Fix pungi repos on builders. --- .../files/builders/fedora-branched-pungi-armhfp.cfg | 2 +- .../koji_builder/files/builders/fedora-branched-pungi-i386.cfg | 2 +- .../files/builders/fedora-branched-pungi-x86_64.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg index 270458e594..da18472f96 100644 --- a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg +++ b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg @@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/armhfp/os [buildroot] name=buildroot -baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/armhfp/ +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/armhfp/ """ diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg index 28ce560705..6bfffb4923 100644 --- a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg +++ b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg @@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os [buildroot] name=buildroot -baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/ +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/i386/ """ diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg index d6b9a892a1..56caf8b46e 100644 --- a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg +++ b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg @@ -30,5 +30,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os [buildroot] name=buildroot -baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/ +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64/ """ From f67b702cf51da2363d3fe87081eafb0179fdc91a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Fri, 17 Oct 2014 11:29:36 +0000 Subject: [PATCH 2/8] Use 'postgresql' prefix with SQLAlchemy instead of 'postgres' --- roles/mailman/templates/mailman.cfg.j2 | 2 +- roles/mailman/templates/settings.py.j2 | 2 +- roles/mailman/templates/settings_admin.py.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/mailman/templates/mailman.cfg.j2 b/roles/mailman/templates/mailman.cfg.j2 index a90d716686..9005b85d5c 100644 --- a/roles/mailman/templates/mailman.cfg.j2 +++ b/roles/mailman/templates/mailman.cfg.j2 @@ -21,7 +21,7 @@ pid_file: /run/mailman3/master.pid [database] class: mailman.database.postgresql.PostgreSQLDatabase -url: postgres://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman +url: postgresql://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman [archiver.hyperkitty] class: hyperkitty.archiver.Archiver diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2 index c539ac03ec..f6eaffef7e 100644 --- a/roles/mailman/templates/settings.py.j2 +++ b/roles/mailman/templates/settings.py.j2 @@ -354,7 +354,7 @@ APP_NAME = 'Fedora list archives' USE_INTERNAL_AUTH = False # URL to the KittyStore database -KITTYSTORE_URL = 'postgres://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore' +KITTYSTORE_URL = 'postgresql://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore' # Path to the KittyStore search index (writable directory) KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index' diff --git a/roles/mailman/templates/settings_admin.py.j2 b/roles/mailman/templates/settings_admin.py.j2 index 161bdb81e2..92e9755a86 100644 --- a/roles/mailman/templates/settings_admin.py.j2 +++ b/roles/mailman/templates/settings_admin.py.j2 @@ -21,4 +21,4 @@ DATABASES = { 'PORT': '', } } -KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore' +KITTYSTORE_URL = 'postgresql://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore' From 4f7ff8efd26ae54f7e55780b5f56bbab148929c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Mon, 20 Oct 2014 09:55:21 +0000 Subject: [PATCH 3/8] Mailman: ansible group conflict in staging --- ...=> main.cf.mailman01.stg.phx2.fedoraproject.org} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename roles/base/files/postfix/main.cf/{main.cf.mailman-stg => main.cf.mailman01.stg.phx2.fedoraproject.org} (99%) diff --git a/roles/base/files/postfix/main.cf/main.cf.mailman-stg b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org similarity index 99% rename from roles/base/files/postfix/main.cf/main.cf.mailman-stg rename to roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org index 2b3291923b..97f4ecec2c 100644 --- a/roles/base/files/postfix/main.cf/main.cf.mailman-stg +++ b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org @@ -93,8 +93,8 @@ mail_owner = postfix #myorigin = $myhostname #myorigin = $mydomain -mydomain = fedoraproject.org -myorigin = fedoraproject.org +mydomain = stg.fedoraproject.org +myorigin = stg.fedoraproject.org # RECEIVING MAIL @@ -156,8 +156,7 @@ inet_interfaces = all # # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". # -mydestination = $myhostname, lists.stg.fedoraproject.org, - localhost.$mydomain, localhost +mydestination = $myhostname, localhost.$mydomain, fedora.redhat.com, localhost, lists.stg.fedoraproject.org, #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, # mail.$mydomain, www.$mydomain, ftp.$mydomain @@ -314,7 +313,7 @@ unknown_local_recipient_reject_code = 550 #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -relayhost = bastion.phx2.fedoraproject.org +relayhost = bastion.phx2.fedoraproject.org # REJECTING UNKNOWN RELAY USERS @@ -680,12 +679,12 @@ sample_directory = /usr/share/doc/postfix-2.4.5/samples # readme_directory = /usr/share/doc/postfix-2.4.5/README_FILES +smtp_host_lookup = native,dns + # add this to new postfix to get it to add proper message-id and other # headers to outgoing emails via the gateway. - message_size_limit = 20971520 -#inet_protocols = ipv4 # Mailman, see MTA.rst From 5368556ea374ab8e46b5535eeb4031cf10a4ef7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Mon, 20 Oct 2014 10:02:47 +0000 Subject: [PATCH 4/8] Small fix after changeset f67b702c --- roles/mailman/files/pg-give-rights.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mailman/files/pg-give-rights.py b/roles/mailman/files/pg-give-rights.py index ea795f20fc..0da1455404 100755 --- a/roles/mailman/files/pg-give-rights.py +++ b/roles/mailman/files/pg-give-rights.py @@ -59,7 +59,7 @@ def main(): # KittyStore dbspec = re.match(""" - postgres:// + postgresql:// (?P[a-z]+) : (?P[^@]+) From 97bb077ec88f100e602a2e99fbb8de9bcb160110 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 20 Oct 2014 14:18:58 +0000 Subject: [PATCH 5/8] Upgrade java to 8 for jenkins For some reason, Java has an arbitrary limit of 2048 bits DH keys, while id.fp.o accepts only 4096. Java 8 supports ECDHE, so let's use that instead. --- playbooks/groups/jenkins-cloud.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 8cbb399879..06f8ae3a1b 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -45,7 +45,7 @@ - vim - dejavu-s\* - fontconfig - - java-1.6.0-openjdk + - java-1.8.0-openjdk - httpd - openssh-clients - git @@ -310,8 +310,8 @@ action: yum state=installed pkg={{ item }} with_items: - vim - - java-1.7.0-openjdk - - java-1.7.0-openjdk-devel + - java-1.8.0-openjdk + - java-1.8.0-openjdk-devel - subversion - bzr - git From e50cb0d8f932270544a06e9eae4a21c7b9f41db6 Mon Sep 17 00:00:00 2001 From: Valentin Gologuzov Date: Mon, 20 Oct 2014 16:48:37 +0200 Subject: [PATCH 6/8] [copr] don't run delete-forgotten-instances.cron on stg instance --- roles/copr/backend/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 909f163b1c..1ab18497ea 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -129,6 +129,7 @@ - name: copy delete-forgotten-instances.cron copy: src="delete-forgotten-instances.cron" dest=/etc/cron.daily/delete-forgotten-instances owner=root group=root mode=755 + when: not devel - name: add sign machine address into the sign.conf lineinfile: "dest=/etc/sign.conf regexp='^server' line='server: {{ signer_host }}'" From d99dfd0fc2d27f0bf68dac96c0d9ffefdfa9dce1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 20 Oct 2014 16:41:54 +0000 Subject: [PATCH 7/8] Change jenkins el7b builder to el7 --- inventory/host_vars/209.132.184.137 | 6 +++--- inventory/inventory | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/host_vars/209.132.184.137 b/inventory/host_vars/209.132.184.137 index ec885f12ad..360b17088a 100644 --- a/inventory/host_vars/209.132.184.137 +++ b/inventory/host_vars/209.132.184.137 @@ -1,11 +1,11 @@ --- instance_type: m1.xlarge -image: "{{ el7b_qcow_id }}" +image: "{{ ami-00000050 }}" keypair: fedora-admin-20130801 security_group: jenkins zone: nova -hostbase: jenkins-el7b +hostbase: jenkins-el7 public_ip: 209.132.184.137 root_auth_users: pingou -description: jenkins el7b worker/slave +description: jenkins el7 worker/slave freezes: false diff --git a/inventory/inventory b/inventory/inventory index 2466e63a4e..26098c5dd4 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -644,7 +644,7 @@ koschei.cloud.fedoraproject.org 209.132.184.165 # F20 builder 209.132.184.209 -# RHEL7beta builder +# RHEL7 builder 209.132.184.137 [jenkins-cloud] From 94b8f20b8612e94c79bc97eab5bc3b8f13c464d9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 20 Oct 2014 16:47:00 +0000 Subject: [PATCH 8/8] Oops. This should be the variable. --- inventory/host_vars/209.132.184.137 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/host_vars/209.132.184.137 b/inventory/host_vars/209.132.184.137 index 360b17088a..0da1a443fe 100644 --- a/inventory/host_vars/209.132.184.137 +++ b/inventory/host_vars/209.132.184.137 @@ -1,6 +1,6 @@ --- instance_type: m1.xlarge -image: "{{ ami-00000050 }}" +image: "{{ el7_qcow_id }}" keypair: fedora-admin-20130801 security_group: jenkins zone: nova