From 945f96e222a792d31a9fc80432e643de8ab56605 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 3 Aug 2016 07:12:10 +0000 Subject: [PATCH 1/3] Disable the pagure-specific genacls.pkgdb script in staging, just for today. --- roles/distgit/tasks/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index 499def547c..c871b5477c 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -186,20 +186,20 @@ owner=root group=root mode=0755 with_items: - genacls.pkgdb - when: env != "staging" + #when: env != "staging" tags: - config - distgit -- name: install the genacls.pkgdb scripts - template: src={{item}} dest=/usr/local/bin/genacls.pkgdb - owner=root group=root mode=0755 - with_items: - - genacls.pkgdb.stg - when: env == "staging" - tags: - - config - - distgit +#- name: install the genacls.pkgdb scripts +# template: src={{item}} dest=/usr/local/bin/genacls.pkgdb +# owner=root group=root mode=0755 +# with_items: +# - genacls.pkgdb.stg +# when: env == "staging" +# tags: +# - config +# - distgit - name: Add the genacl daily cron job copy: src=genacls.cron dest=/etc/cron.d/genacls.cron From be8181e3160b00da4beeca1eb39439721174582c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 3 Aug 2016 07:27:52 +0000 Subject: [PATCH 2/3] drop whitespace that causes change in prod --- roles/koji_builder/templates/builders/site-defaults.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/koji_builder/templates/builders/site-defaults.cfg b/roles/koji_builder/templates/builders/site-defaults.cfg index 1c45b74d91..d39a2364be 100644 --- a/roles/koji_builder/templates/builders/site-defaults.cfg +++ b/roles/koji_builder/templates/builders/site-defaults.cfg @@ -1,7 +1,6 @@ config_opts['plugin_conf']['package_state_enable'] = False config_opts['plugin_conf']['ccache_enable'] = False config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0'] - {% if env == 'staging' %} config_opts['plugin_conf']['tmpfs_enable'] = True config_opts['plugin_conf']['tmpfs_opts'] = {} From 6a92f69ff6cdbc9c54d3e750485aa8159ea0d21b Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 3 Aug 2016 07:30:19 +0000 Subject: [PATCH 3/3] Disable stg tmpfs plugin for now. --- .../templates/builders/site-defaults.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/koji_builder/templates/builders/site-defaults.cfg b/roles/koji_builder/templates/builders/site-defaults.cfg index d39a2364be..516975d0ad 100644 --- a/roles/koji_builder/templates/builders/site-defaults.cfg +++ b/roles/koji_builder/templates/builders/site-defaults.cfg @@ -1,11 +1,11 @@ config_opts['plugin_conf']['package_state_enable'] = False config_opts['plugin_conf']['ccache_enable'] = False config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0'] -{% if env == 'staging' %} -config_opts['plugin_conf']['tmpfs_enable'] = True -config_opts['plugin_conf']['tmpfs_opts'] = {} -config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024 -config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '6g' -config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755' -config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False -{% endif %} +#{% if env == 'staging' %} +#config_opts['plugin_conf']['tmpfs_enable'] = True +#config_opts['plugin_conf']['tmpfs_opts'] = {} +#config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024 +#config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '6g' +#config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755' +#config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False +#{% endif %}