PR#639: Koji: prepare for prod deployment of rpmautospec - fedora-infra/ansible

fedora-infra / ansible

#639 Koji: prepare for prod deployment of rpmautospec

Merged 4 years ago by humaton. Opened 4 years ago by nphilipp.

fedora-infra/ nphilipp/ansible main--rpmautospec-prod into main

Koji: prepare for prod deployment of rpmautospec

Nils Philippsen • 4 years ago

9a5d550

roles/koji_builder/tasks/main.yml

file modified

+12 -7

		`@@ -132,20 +132,25 @@`
		`#`

		`- name: install koji builder rpmautospec plugin`
		`- package: name={{ item }} state=latest`
		`+ package:`
		`+ name: "{{ item }}"`
		`+ state: present`
		`with_items:`
		`- koji-builder-plugin-rpmautospec`
		`- when: env == 'staging'`
		`tags:`
		`- packages`
		`- koji_builder`
		`- rpmautospec`

		`- - name: install the configuration file for rpmautospec`
		`- template:`
		`- src: "{{ playbook_dir }}/../../roles/koji_hub/templates/rpmautospec.conf"`
		`- dest: /etc/kojid/plugins/rpmautospec.conf`
		`- when: env == 'staging'`
		`+ - name: remove obsolete configuration of rpmautospec`
		`+ file:`
		`+ path: "/etc/kojid/plugins/{{ item }}"`
		`+ state: absent`
		`+ loop:`
		`+ - rpmautospec.conf`
		`+ - rpmautospec.conf.rpmnew`
		`+ - rpmautospec.conf.rpmsave`
		`+ - rpmautospec.conf.rpmorig`
		`tags:`
		`- koji_builder`
		`- rpmautospec`

roles/koji_builder/templates/kojid.conf

file modified

-2

		`@@ -153,9 +153,7 @@`
		`{{ plugins.append("builder_containerbuild") }}`
		`{% endif %}`

		`- {% if env == 'staging' %}`
		`{{ plugins.append("rpmautospec_builder") }}`
		`- {% endif %}`

		`; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled`
		`plugins = {{ plugins \| join(" ") }}`

roles/koji_hub/tasks/main.yml

file modified

+11 -8

		`@@ -186,21 +186,24 @@`
		`# rpmautospec plugin`
		`#`

		`- - name: install koji hub rpmautospec plugin`
		`- package: name={{ item }} state=latest`
		`+ - name: uninstall koji hub rpmautospec plugin`
		`+ package: name={{ item }} state=absent`
		`with_items:`
		`- koji-hub-plugin-rpmautospec`
		`- when: env == 'staging'`
		`tags:`
		`- packages`
		`- koji_hub`
		`- rpmautospec`

		`- - name: install the configuration file for rpmautospec`
		`- template:`
		`- src: rpmautospec.conf`
		`- dest: /etc/koji-hub/plugins/rpmautospec.conf`
		`- when: env == 'staging'`
		`+ - name: remove obsolete configuration for rpmautospec`
		`+ file:`
		`+ path: "/etc/koji-hub/plugins/{{ item }}"`
		`+ state: absent`
		`+ loop:`
		`+ - rpmautospec.conf`
		`+ - rpmautospec.conf.rpmnew`
		`+ - rpmautospec.conf.rpmsave`
		`+ - rpmautospec.conf.rpmorig`
		`tags:`
		`- koji_hub`
		`- rpmautospec`

roles/koji_hub/templates/hub.conf.j2

file modified

-4

		`@@ -84,11 +84,7 @@`

		`#Plugins = koji-disable-builds-plugin`
		`#Plugins = darkserver-plugin`
		`- {% if env == 'staging' %}`
		`- Plugins = fedmsg-koji-plugin runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree rpmautospec_hub`
		`- {% else %}`
		`Plugins = fedmsg-koji-plugin runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree`
		`- {% endif %}`

		`[policy]`

roles/koji_hub/templates/rpmautospec.conf

file removed

-5

		`@@ -1,5 +0,0 @@`
		`- [pagure]`
		`- {% if env == 'staging' %}`
		`- url = https://src.stg.fedoraproject.org`
		`- token = {{ rpmautospec_pagure_token_stg }}`
		`- {% endif %}`

nphilipp commented 4 years ago

The relevant parts were made conditional and only applied in the staging
environment, change that. Alongside, ensure the obsolete hub plugin
package and plugin configuration files are removed and don't
automatically update any of the involved packages.

zuul commented 4 years ago

Build succeeded.

fi-ansible--ansible-review-diff : SUCCESS in 3m 00s

nphilipp commented 4 years ago

Corresponding deployment ticket: fedora-infrastructure#10031

zuul commented 4 years ago

Build succeeded.

fi-ansible--ansible-review-diff : SUCCESS in 2m 38s

kevin commented on line 13 of roles/koji_builder/tasks/main.yml 4 years ago

In general we have avoided kojid restarts from the playbook... they are pretty disruptive as every build thats in progress will restart. :(
I suppose we could keep it here since we don't install this plugin very often, but do note that when we run it likely some people will be mad that their many hour build restarted. ;(

kevin commented 4 years ago

Otherwise looks ok to me. ;) I guess we could keep this in for this one-time deploy...

nphilipp commented on line 13 of roles/koji_builder/tasks/main.yml 4 years ago

I'm fine with removing the notification and restartd kojids manually, but we will have to restart i.e. disrupt things for this. Maybe we should announce this a day ahead, "we will restart builders, in-flight builds will be restarted, too"? I can do that when we've planned a schedule for fedora-infrastructure#10031.

Edited 4 years ago by nphilipp

rebased onto a2f66a90ec3172476cfc8597eb34a50b3be238df

4 years ago

nphilipp commented 4 years ago

The latest push doesn't restart kojid anymore when the rpmautospec builder plugin is installed. Note that there are a number of other tasks in the same playbook that would (if changing things).

zuul commented 4 years ago

Build succeeded.