[ansible] Revert "Add koji-hub"
by Nicolas Chauvet
commit ed590c53d30808237242f0eb48f0080b87962737
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Apr 6 00:44:04 2019 +0200
Revert "Add koji-hub"
This reverts commit dda21513e3b3a5baabc41122c62673e3051925a9.
playbooks/groups/koji-hub.yml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index de4d143..c1f3b6f 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -2,7 +2,7 @@
# NOTE: should be used with --limit most of the time
# NOTE: most of these vars_path come from group_vars/koji-hub or from hostvars
-#- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji"
# Once the instance exists, configure it.
@@ -23,14 +23,14 @@
- import_tasks: "{{ tasks_path }}/yumrepos.yml"
roles:
-# - base
+ - base
- rkhunter
- nagios/client
- hosts
- fas_client
-# - collectd/base
+ - collectd/base
- apache
-# - fedmsg/base
+ - fedmsg/base
- { role: nfs/server, when: env == "staging" }
# - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') }
- role: nfs/client
5 years, 8 months
[ansible] Add koji_builder
by Nicolas Chauvet
commit fa85d27d0f0f387dec61610eb85e9ac2a7a40127
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Apr 6 00:42:54 2019 +0200
Add koji_builder
roles/koji_builder/tasks/main.yml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 9fcbd88..d87d52e 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -101,13 +101,12 @@
service: name=virtlogd state=started enabled=yes
tags:
- koji_builder
- when: ansible_distribution_major_version|int > 23 and ansible_architecture != 'armv7l'
+ when: ansible_architecture != 'armv7l'
- name: create kojid service override directory
file: path=/etc/systemd/system/kojid.service.d state=directory
tags:
- koji_buidler
- when: ansible_distribution_major_version|int > 6
- name: systemd kojid service override
copy: src=builders/kojid.service.d.override.conf dest=/etc/systemd/system/kojid.service.d/override.conf
5 years, 8 months
[ansible] Add koji-hub
by Nicolas Chauvet
commit dda21513e3b3a5baabc41122c62673e3051925a9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Apr 6 00:41:46 2019 +0200
Add koji-hub
playbooks/groups/koji-hub.yml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index c1f3b6f..de4d143 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -2,7 +2,7 @@
# NOTE: should be used with --limit most of the time
# NOTE: most of these vars_path come from group_vars/koji-hub or from hostvars
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji"
+#- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji"
# Once the instance exists, configure it.
@@ -23,14 +23,14 @@
- import_tasks: "{{ tasks_path }}/yumrepos.yml"
roles:
- - base
+# - base
- rkhunter
- nagios/client
- hosts
- fas_client
- - collectd/base
+# - collectd/base
- apache
- - fedmsg/base
+# - fedmsg/base
- { role: nfs/server, when: env == "staging" }
# - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') }
- role: nfs/client
5 years, 8 months
[ansible] Add aarch64-10
by Nicolas Chauvet
commit 6a6958d600f142a8e6018b6a4dbff38a01263d9b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 5 19:57:43 2019 +0200
Add aarch64-10
inventory/builders | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/inventory/builders b/inventory/builders
index cfbf0c0..f6f7f5d 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -4,6 +4,7 @@ aarch64-02.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_p
aarch64-03.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_python_interpreter=/usr/bin/python3
aarch64-04.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_python_interpreter=/usr/bin/python3
aarch64-jetson-tx1.home.rpmfusion.net
+aarch64-10.home.rpmfusion.net
[buildppc]
5 years, 8 months
[ansible] update for el8
by Nicolas Chauvet
commit 0a13cc648a63e4e1b4d64cdc083e0d2f5ccd2b75
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 4 18:39:43 2019 +0200
update for el8
roles/koji_hub/files/koji-gc.conf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/roles/koji_hub/files/koji-gc.conf b/roles/koji_hub/files/koji-gc.conf
index 07f4612..1f9d431 100644
--- a/roles/koji_hub/files/koji-gc.conf
+++ b/roles/koji_hub/files/koji-gc.conf
@@ -29,8 +29,8 @@ key_aliases =
5568BBB2 fedora-el-6-nonfree
F5CF6C1E fedora-el-7-free
A3108F6C fedora-el-7-nonfree
- F5CF6C1E fedora-el-8-free
- A3108F6C fedora-el-8-nonfree
+ 837935CD19E123AA7F8A8E69979F0C69158B3811 fedora-el-8-free
+ CF9FD59F61D6612146CDAC8E14B6792DBDDA8475 fedora-el-8-nonfree
unprotected_keys =
fedora-22-free
5 years, 8 months
[ansible] Update koji-hub
by Nicolas Chauvet
commit 6b9a6b1c5f88a9922457e6614a6f5fb91a80f173
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 4 18:37:56 2019 +0200
Update koji-hub
roles/koji_hub/templates/hub.conf.j2 | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index b88bd11..607b6f7 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -22,7 +22,7 @@ CheckClientIP = False
## the client username is the common name of the subject of their client certificate
DNUsernameComponent = CN
## separate multiple DNs with |
-ProxyDNs = emailAddress=rpmfusion-buildsys(a)rpmfusion.org,CN=kojiweb,O=RPM Fusion,ST=Province,C=EU|emailAddress=rpmfusion-buildsys(a)rpmfusion.org,CN=sign-bridge1,O=RPM Fusion,ST=Provine,C=EU
+ProxyDNs = emailAddress=rpmfusion-buildsys(a)rpmfusion.org,CN=kojiweb,O=RPM Fusion,ST=Province,C=EU|emailAddress=rpmfusion-buildsys(a)lists.rpmfusion.org,CN=sign-bridge1,O=RPM Fusion Project,ST=Province,C=EU
## end SSL client certificate auth configuration
@@ -92,6 +92,9 @@ channel =
method createrepo :: use createrepo
method createdistrepo :: use createrepo
method buildContainer :: use powerbuilder
+ buildtag *-rpi :: use powerbuilder
+ method buildSRPMFromSCM && buildtag *rpi :: use powerbuilder
+ method buildSRPMFromSCM :: use createrepo
has req_channel && has_perm customchannel :: req
is_child_task :: parent
# Policy to move build to powerfull builders
5 years, 8 months
[ansible] Add koji-gc
by Nicolas Chauvet
commit dfacbb6770d7eec20182ebc2aae9f3f2aee3fc30
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 4 18:37:30 2019 +0200
Add koji-gc
roles/koji_hub/files/koji-gc.conf | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/roles/koji_hub/files/koji-gc.conf b/roles/koji_hub/files/koji-gc.conf
index 445338a..07f4612 100644
--- a/roles/koji_hub/files/koji-gc.conf
+++ b/roles/koji_hub/files/koji-gc.conf
@@ -17,12 +17,20 @@ key_aliases =
C1D5D3457F317578802EE33787047784B9C13282 fedora-27-nonfree
34249D2CB3758B5548E2874FC08D326909EAB3F2 fedora-28-free
3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 fedora-28-nonfree
+ 34249D2CB3758B5548E2874FC08D326909EAB3F2 fedora-29-free
+ 18A50439A072A393E47178D49C009EABD6841AF8 fedora-29-nonfre
+ 80C3B2C6E727F3E092B473E03DF2CE43C0AEDA6E fedora-30-free
+ 80171C8D2CC8AAB84C8448E9BDD6ECC41D14A795 fedora-30-nonfre
+ 59A7FE07F664C1B27687C5D26DEEF051C481937A fedora-31-free
+ 4CAB951A7493D92CADEC04219CE63A0354A86092 fedora-31-nonfre
E74F0522 fedora-el-5-free
B1981B68 fedora-el-5-nonfree
849C449F fedora-el-6-free
5568BBB2 fedora-el-6-nonfree
F5CF6C1E fedora-el-7-free
A3108F6C fedora-el-7-nonfree
+ F5CF6C1E fedora-el-8-free
+ A3108F6C fedora-el-8-nonfree
unprotected_keys =
fedora-22-free
@@ -33,12 +41,18 @@ unprotected_keys =
fedora-24-nonfree
fedora-25-free
fedora-25-nonfree
+ fedora-26-free
+ fedora-26-nonfree
+ fedora-27-free
+ fedora-27-nonfree
fedora-el-5-free
fedora-el-5-nonfree
fedora-el-6-free
fedora-el-6-nonfree
fedora-el-7-free
fedora-el-7-nonfree
+ fedora-el-8-free
+ fedora-el-8-nonfree
server = https://koji.rpmfusion.org/kojihub
serverca = /etc/koji-gc/serverca.crt
@@ -53,18 +67,6 @@ policy =
#note that tags with master lock engaged are already protected
tag *-updates :: keep
age < 1 day :: skip
- sig fedora-22-free && age < 12 weeks :: keep
- sig fedora-22-nonfree && age < 12 weeks :: keep
- sig fedora-23-free && age < 12 weeks :: keep
- sig fedora-23-nonfree && age < 12 weeks :: keep
- sig fedora-24-free && age < 12 weeks :: keep
- sig fedora-24-nonfree && age < 12 weeks :: keep
- sig fedora-25-free && age < 12 weeks :: keep
- sig fedora-25-nonfree && age < 12 weeks :: keep
- sig fedora-26-free && age < 12 weeks :: keep
- sig fedora-26-nonfree && age < 12 weeks :: keep
- sig fedora-27-free && age < 12 weeks :: keep
- sig fedora-27-nonfree && age < 12 weeks :: keep
sig fedora-28-free && age < 12 weeks :: keep
sig fedora-28-nonfree && age < 12 weeks :: keep
sig fedora-el-5-free && age < 12 weeks :: keep
@@ -73,6 +75,8 @@ policy =
sig fedora-el-6-nonfree && age < 12 weeks :: keep
sig fedora-el-7-free && age < 12 weeks :: keep
sig fedora-el-7-nonfree && age < 12 weeks :: keep
+ sig fedora-el-8-free && age < 12 weeks :: keep
+ sig fedora-el-8-nonfree && age < 12 weeks :: keep
#stuff to chuck semi-rapidly
tag *-testing *-candidate *-override && order >= 2 :: untag
5 years, 8 months
[ansible] Add more check_mode: no
by Nicolas Chauvet
commit ba112033d49124d719ec38a7e360308acf579a2a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 4 18:27:12 2019 +0200
Add more check_mode: no
playbooks/manual/update-firmware.yml | 10 +++++-----
roles/fedmsg/base/tasks/main.yml | 2 +-
roles/mirrormanager/mirrorlist2/tasks/main.yml | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/playbooks/manual/update-firmware.yml b/playbooks/manual/update-firmware.yml
index a065fc1..301880a 100644
--- a/playbooks/manual/update-firmware.yml
+++ b/playbooks/manual/update-firmware.yml
@@ -49,13 +49,13 @@
tasks:
- name: Create drop place for upgrades
- always_run: true
+ check_mode: no
when: ansible_virtualization_role == "host"
file: path=/root/firmware-upgrades
state=directory
- name: Check which updates to copy
- always_run: true
+ check_mode: no
stat: path=/root/firmware-upgrades/{{ item.1}}.applied
register: is_applied_results
when: item.0.vendor == ansible_system_vendor and item.0.product == ansible_product_name
@@ -64,7 +64,7 @@
- files
- name: Copy updates
- always_run: true
+ check_mode: no
copy: src={{ bigfiles }}/firmware/{{ item.item.0.dirname }}/{{ item.item.1}}
dest=/root/firmware-upgrades/
mode=0700
@@ -75,7 +75,7 @@
# Dell updates here
- name: Check Dell updates
- always_run: true
+ check_mode: no
command: /root/firmware-upgrades/{{ item.item.1}} -qc
register: check_results
failed_when: "'System(s) supported by this package' in check_results.stdout"
@@ -105,7 +105,7 @@
# We are cleaning up all files we copied, regardless of update result
- name: Delete update files
- always_run: true
+ check_mode: no
file: path=/root/firmware-upgrades/{{ item.item.1 }}
state=absent
when: "'stat' in item and not item.stat.exists"
diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index bf00ac6..5eaa2ef 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -322,7 +322,7 @@
- name: Check if the nrpe user exists
shell: /usr/bin/getent passwd nrpe | /usr/bin/wc -l | tr -d ' '
register: nrpe_exists
- always_run: true
+ check_mode: no
changed_when: "1 != 1"
tags:
- fedmsg/base
diff --git a/roles/mirrormanager/mirrorlist2/tasks/main.yml b/roles/mirrormanager/mirrorlist2/tasks/main.yml
index 8bf8e89..a8145a3 100644
--- a/roles/mirrormanager/mirrorlist2/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist2/tasks/main.yml
@@ -52,7 +52,7 @@
#- name: check to see if its even installed yet
# shell: semodule -l | grep mirrorlist2 | wc -l
# register: ficgeneral_grep
-# always_run: true
+# check_mode: no
# changed_when: "'0' in ficgeneral_grep.stdout"
# tags:
# - mirrorlist2
5 years, 8 months
[ansible] Update to check_mode: no
by Nicolas Chauvet
commit b42f20b55dca25447e18d5054c8ab9806dfb711a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 4 18:23:45 2019 +0200
Update to check_mode: no
roles/cgit/make_pkgs_list/tasks/main.yml | 2 +-
roles/distgit/tasks/main.yml | 6 +++---
roles/fedmsg/base/tasks/main.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/roles/cgit/make_pkgs_list/tasks/main.yml b/roles/cgit/make_pkgs_list/tasks/main.yml
index bcaa4d1..8646338 100644
--- a/roles/cgit/make_pkgs_list/tasks/main.yml
+++ b/roles/cgit/make_pkgs_list/tasks/main.yml
@@ -48,7 +48,7 @@
- name: check the selinux context of the repo list
command: matchpathcon /srv/git/pkgs-git-repos-list
register: gitlistcontext
- always_run: yes
+ check_mode: no
changed_when: false
tags:
- config
diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index 31d2376..74c68fe 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -38,7 +38,7 @@
- name: check the selinux context of the distgit root directory
command: matchpathcon /srv/git
register: distgitcontext
- always_run: yes
+ check_mode: no
changed_when: false
tags:
- config
@@ -298,7 +298,7 @@
- name: check the selinux context of the Lookaside Cache root directory
command: matchpathcon /srv/cache
register: lcachecontext
- always_run: yes
+ check_mode: no
changed_when: false
tags:
- config
@@ -352,7 +352,7 @@
- name: check the selinux context of the upload CGI script
command: matchpathcon /srv/web/upload.cgi
register: upcgicontext
- always_run: yes
+ check_mode: no
changed_when: false
tags:
- config
diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index f57c8f6..bf00ac6 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -308,7 +308,7 @@
- name: check semanage ports
command: semanage port -l
register: semanageoutput
- always_run: yes
+ check_mode: no
changed_when: "1 != 1"
tags:
- fedmsg/base
5 years, 8 months