[ansible] Update infra-tags repos
by Nicolas Chauvet
commit 704132ffe9a045ffd15351b8d598e30095450d28
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Sep 11 12:26:38 2017 +0200
Update infra-tags repos
files/common/fedora-infra-tags-stg.repo | 6 ++++
files/common/fedora-infra-tags.repo | 6 ++++
files/common/rhel-infra-tags-stg.repo | 6 ++++
files/common/rhel-infra-tags.repo | 6 ++++
tasks/yumrepos.yml | 39 +++++++++++++++++++++++++++++-
5 files changed, 61 insertions(+), 2 deletions(-)
---
diff --git a/files/common/fedora-infra-tags-stg.repo b/files/common/fedora-infra-tags-stg.repo
new file mode 100644
index 0000000..1a4b0d8
--- /dev/null
+++ b/files/common/fedora-infra-tags-stg.repo
@@ -0,0 +1,6 @@
+[infrastructure-tags-stg]
+name=Fedora Infrastructure staging tag $releasever - $basearch
+baseurl=https://infrastructure.fedoraproject.org/repo/infra/f$releasever-infra-stg/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/files/common/fedora-infra-tags.repo b/files/common/fedora-infra-tags.repo
new file mode 100644
index 0000000..1ed309c
--- /dev/null
+++ b/files/common/fedora-infra-tags.repo
@@ -0,0 +1,6 @@
+[infrastructure-tags]
+name=Fedora Infrastructure tag $releasever - $basearch
+baseurl=https://infrastructure.fedoraproject.org/repo/infra/f$releasever-infra/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/files/common/rhel-infra-tags-stg.repo b/files/common/rhel-infra-tags-stg.repo
new file mode 100644
index 0000000..4f6de9e
--- /dev/null
+++ b/files/common/rhel-infra-tags-stg.repo
@@ -0,0 +1,6 @@
+[infrastructure-tags-stg]
+name=Fedora Infrastructure tag $releasever - $basearch
+baseurl=https://infrastructure.fedoraproject.org/repo/infra/epel$releasever-infra-stg/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/files/common/rhel-infra-tags.repo b/files/common/rhel-infra-tags.repo
new file mode 100644
index 0000000..ece3b4f
--- /dev/null
+++ b/files/common/rhel-infra-tags.repo
@@ -0,0 +1,6 @@
+[infrastructure-tags]
+name=Fedora Infrastructure tag $releasever - $basearch
+baseurl=https://infrastructure.fedoraproject.org/repo/infra/epel$releasever-infra/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index 5960ecb..5ae06a5 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -1,8 +1,43 @@
---
+- name: add infrastructure tags repo - RHEL
+ copy: src="{{ files }}/common/rhel-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo"
+ when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
+ tags:
+ - config
+ - packages
+ - yumrepos
+
+- name: add infrastructure STAGING tags repo - RHEL
+ copy: src="{{ files }}/common/rhel-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo"
+ when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and env == 'staging'
+ tags:
+ - config
+ - packages
+ - yumrepos
+
+- name: add infrastructure tags repo - Fedora
+ copy: src="{{ files }}/common/fedora-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo"
+ when: ansible_distribution == 'Fedora'
+ tags:
+ - config
+ - packages
+ - yumrepos
+
+- name: add infrastructure STAGING tags repo - Fedora
+ copy: src="{{ files }}/common/fedora-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo"
+ when: ansible_distribution == 'Fedora' and env == 'staging'
+ tags:
+ - config
+ - packages
+ - yumrepos
-- name: add infrastructure repo
- copy: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
+- name: Make sure older infrastructure tags repos no longer exist
+ file: path="/etc/yum.repos.d/{{item}}" state=absent
with_items:
+ - fedora-infra-tags.repo
+ - fedora-infra-tags-stg.repo
+ - rhel-infra-tags.repo
+ - rhel-infra-tags-stg.repo
- infrastructure.repo
- infrastructure-testing.repo
tags:
7 years, 3 months
[ansible] Update rawhide as 28
by Nicolas Chauvet
commit 1d5d0b1fb7c9bb1920515d9ae583d1827a6a57c8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Sep 9 11:22:01 2017 +0200
Update rawhide as 28
roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
index 6f7f655..7cc394d 100755
--- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
+++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
@@ -25,7 +25,7 @@ sys.path.append('.')
import koji
-rawhide = '27'
+rawhide = '28'
extraArchList = {'ffmpeg': ('armv7hnl'),
'x264': ('armv7hnl'),
'x265': ('armv7hnl',),
7 years, 3 months
[ansible] Remove owner sync el5
by Nicolas Chauvet
commit 1eb51fc5e48ee7beb754d4ce022030834b4914d9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Sep 9 11:11:00 2017 +0200
Remove owner sync el5
roles/bodhi2/backend/tasks/main.yml | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 1f1270f..4e73713 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -163,14 +163,6 @@
- config
- bodhi
-- name: sync packages from pkgdb2 to koji (el5)
- cron: name="owner-sync-el5" minute="2,12,22,32,42,52" user="root"
- job="/usr/local/bin/owner-sync-pkgdb el5-free ; /usr/local/bin/owner-sync-pkgdb el5-nonfree"
- cron_file=update-koji-owner-el5
- when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
- tags:
- - bodhi
-
- name: sync packages from pkgdb2 to koji (el6)
cron: name="owner-sync-el6" minute="3,13,23,33,43,53" user="root"
job="/usr/local/bin/owner-sync-pkgdb el6-free ; /usr/local/bin/owner-sync-pkgdb el6-nonfree"
7 years, 3 months
[ansible] Update owner-sync pkgdb2 for f27/28
by Nicolas Chauvet
commit 163b02e70691d3be838abe8fa62b610320e8c44d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Sep 9 11:10:10 2017 +0200
Update owner-sync pkgdb2 for f27/28
roles/bodhi2/backend/tasks/main.yml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index fbc6974..1f1270f 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -189,7 +189,7 @@
- name: sync packages from pkgdb2 to koji fedora
cron: name="owner-sync-fedora" minute="7,17,27,37,47,57" user="root"
- job="/usr/local/bin/owner-sync-pkgdb f24-free; /usr/local/bin/owner-sync-pkgdb f24-nonfree; /usr/local/bin/owner-sync-pkgdb f25-free; /usr/local/bin/owner-sync-pkgdb f25-nonfree; /usr/local/bin/owner-sync-pkgdb f26-free; /usr/local/bin/owner-sync-pkgdb f26-nonfree"
+ job="/usr/local/bin/owner-sync-pkgdb f25-free; /usr/local/bin/owner-sync-pkgdb f25-nonfree; /usr/local/bin/owner-sync-pkgdb f26-free; /usr/local/bin/owner-sync-pkgdb f26-nonfree; /usr/local/bin/owner-sync-pkgdb f27-free; /usr/local/bin/owner-sync-pkgdb f27-nonfree; /usr/local/bin/owner-sync-pkgdb f28-free; /usr/local/bin/owner-sync-pkgdb f28-nonfree"
cron_file=update-koji-owner-fedora
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
tags:
7 years, 3 months
[ansible] Add proxy01.sclaway iptables
by Nicolas Chauvet
commit 64f315ae52c8ad9618582504635eba24eb409040
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Sep 9 11:06:52 2017 +0200
Add proxy01.sclaway iptables
inventory/host_vars/proxy01.scaleway.rpmfusion.net | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/inventory/host_vars/proxy01.scaleway.rpmfusion.net b/inventory/host_vars/proxy01.scaleway.rpmfusion.net
index 72a924c..b13dda0 100644
--- a/inventory/host_vars/proxy01.scaleway.rpmfusion.net
+++ b/inventory/host_vars/proxy01.scaleway.rpmfusion.net
@@ -1,4 +1,4 @@
datacenter: scaleway
# Neeed for builders to access proxy
-custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.1.0.228 --dport 3128 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.1.32.225 --dport 3128 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.1.0.204 --dport 3128 -j ACCEPT' ]
+custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.1.0.228 --dport 3128 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.1.32.225 --dport 3128 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.1.0.204 --dport 3128 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.1.48.151 --dport 3128 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.1.41.76 --dport 3128 -j ACCEPT' ]
7 years, 3 months
[ansible] allows build_arch to fail
by Nicolas Chauvet
commit fcbffea4e097952e3e6ceaa6dd0cf97370487c85
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Sep 9 11:06:36 2017 +0200
allows build_arch to fail
roles/koji_builder/templates/kojid.conf | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index a009e58..12e6d04 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -58,6 +58,10 @@ allowed_scms=pkgs.stg.rpmfusion.org:/docker/*:false pkgs.stg.rpmfusion.org:/rpms
allowed_scms=pkgs.rpmfusion.org:/*:false:rfpkg-minimal,sources
{% endif %}
+; allow tasks to continue to completion if a sibling fails
+; the parent task will fail but all child tasks will complete
+build_arch_can_fail = true
+
; The mail host to use for sending email notifications
smtphost=localhost
7 years, 3 months
[ansible] Update pkgdb2 mapping
by Nicolas Chauvet
commit 2a0b210c3ee1e05cd825a83566a0ee945643829a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Sep 9 11:05:55 2017 +0200
Update pkgdb2 mapping
roles/pkgdb2/templates/pkgdb2.cfg | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg
index 95f35ca..80cf40d 100644
--- a/roles/pkgdb2/templates/pkgdb2.cfg
+++ b/roles/pkgdb2/templates/pkgdb2.cfg
@@ -179,20 +179,16 @@ FEDOCAL_CALENDAR_SHIELD = 'vacation'
REPO_MAP = [
('rawhide-free', 'free/fedora/development/rawhide/Everything/source/SRPMS/'),
('rawhide-nonfree', 'nonfree/fedora/development/rawhide/Everything/source/SRPMS/'),
- ('f26-free', 'free/fedora/development/26/Everything/source/SRPMS/'),
- ('f26-nonfree', 'nonfree/fedora/development/26/Everything/source/SRPMS/'),
+ ('f27-free', 'free/fedora/development/27/Everything/source/SRPMS/'),
+ ('f27-nonfree', 'nonfree/fedora/development/27/Everything/source/SRPMS/'),
+ ('f26-free', 'free/fedora/releases/26/Everything/source/SRPMS/'),
+ ('f26-free-up', 'free/fedora/updates/26/SRPMS/'),
+ ('f26-nonfree', 'nonfree/fedora/releases/26/Everything/source/SRPMS/'),
+ ('f26-nonfree-up', 'nonfree/fedora/updates/26/SRPMS/'),
('f25-free', 'free/fedora/releases/25/Everything/source/SRPMS/'),
('f25-free-up', 'free/fedora/updates/25/SRPMS/'),
('f25-nonfree', 'nonfree/fedora/releases/25/Everything/source/SRPMS/'),
('f25-nonfree-up', 'nonfree/fedora/updates/25/SRPMS/'),
- ('f24-free', 'free/fedora/releases/24/Everything/source/SRPMS/'),
- ('f24-free-up', 'free/fedora/updates/24/SRPMS/'),
- ('f24-nonfree', 'nonfree/fedora/releases/24/Everything/source/SRPMS/'),
- ('f24-nonfree-up', 'nonfree/fedora/updates/24/SRPMS/'),
- ('f23-free-up', 'free/fedora/updates/23/SRPMS/'),
- ('f23-nonfree-up', 'nonfree/fedora/updates/23/SRPMS/'),
- ('f23-free-rel', 'free/fedora/releases/23/Everything/source/SRPMS'),
- ('f23-nonfree-rel', 'nonfree/fedora/releases/23/Everything/source/SRPMS'),
('el7-free', 'free/el/updates/7/SRPMS/'),
('el7-nonfree', 'nonfree/el/updates/7/SRPMS/'),
('el6-free', 'free/el/updates/6/SRPMS/'),
7 years, 3 months