diff --git a/inventory/group_vars/retrace b/inventory/group_vars/retrace index 4672b4c485..8f8e854e1d 100644 --- a/inventory/group_vars/retrace +++ b/inventory/group_vars/retrace @@ -1,4 +1,6 @@ --- +env: production + primary_auth_source: ipa ipa_host_group: retrace ipa_host_group_desc: Retrace servers @@ -22,8 +24,6 @@ custom_rules: nrpe_procs_warn: 1800 nrpe_procs_crit: 2000 -devel: false - # Since retrace is on the qa network, it needs to actively connect to our # inbound relay. fedmsg_active: True diff --git a/inventory/group_vars/retrace_stg_aws b/inventory/group_vars/retrace_stg_aws index 5e53a6c9ba..b5c737874e 100644 --- a/inventory/group_vars/retrace_stg_aws +++ b/inventory/group_vars/retrace_stg_aws @@ -1,11 +1,12 @@ --- +env: staging + ipa_host_group: retrace ipa_host_group_desc: Retrace servers ipa_client_shell_groups: - retrace ipa_client_sudo_groups: - retrace -devel: true vpn: true diff --git a/roles/abrt/faf-post/tasks/cron.yml b/roles/abrt/faf-post/tasks/cron.yml index 2903c3ed6b..69867dceeb 100644 --- a/roles/abrt/faf-post/tasks/cron.yml +++ b/roles/abrt/faf-post/tasks/cron.yml @@ -96,7 +96,7 @@ job: "faf archive-reports -d >> /var/log/faf/archive-reports.log 2>&1" special_time: daily state: present - when: not devel|bool + when: env != 'staging' - name: Cron job for deleting old archives cron: diff --git a/roles/abrt/retrace-post/tasks/cron.yml b/roles/abrt/retrace-post/tasks/cron.yml index 0613f9b4bb..f8b585797a 100644 --- a/roles/abrt/retrace-post/tasks/cron.yml +++ b/roles/abrt/retrace-post/tasks/cron.yml @@ -7,7 +7,6 @@ special_time: daily state: present loop: "{{ rs_internal_fedora_vers | product(rs_internal_arch_list) | list }}" - when: not devel|bool - name: Remove retrace-server reposync cron jobs of removed Fedora versions cron: @@ -17,7 +16,6 @@ special_time: daily state: absent loop: "{{ rs_internal_fedora_vers_removed | product(rs_internal_arch_list) | list}}" - when: not devel|bool - name: Create retrace-server reposync cron job for CentOS 7 cron: @@ -26,7 +24,6 @@ job: "/usr/bin/retrace-server-reposync centos 7 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" special_time: daily state: present - when: not devel|bool - name: Create retrace-server cleanup cron job cron: @@ -35,7 +32,6 @@ job: "/usr/bin/retrace-server-cleanup >> /var/log/retrace-server/cleanup_error.log 2>&1" special_time: daily state: present - when: not devel|bool - name: Create cron job for retrace-server cron: @@ -44,4 +40,3 @@ job: "/usr/bin/podman system prune --all --force >> /var/log/retrace-server/podman_prune.log 2>&1" special_time: daily state: present - when: not devel|bool diff --git a/roles/abrt/retrace-post/tasks/main.yml b/roles/abrt/retrace-post/tasks/main.yml index 1b06bcbe42..3c905f5d7a 100644 --- a/roles/abrt/retrace-post/tasks/main.yml +++ b/roles/abrt/retrace-post/tasks/main.yml @@ -3,6 +3,7 @@ # Setup retrace-server - import_tasks: retrace_setup.yml -# Set up cron jobs for retrace-server +# Set up production cron jobs for retrace-server - import_tasks: cron.yml tags: cron + when: env != 'staging' diff --git a/roles/abrt/retrace-post/tasks/retrace_setup.yml b/roles/abrt/retrace-post/tasks/retrace_setup.yml index edac160c78..c7692b12e9 100644 --- a/roles/abrt/retrace-post/tasks/retrace_setup.yml +++ b/roles/abrt/retrace-post/tasks/retrace_setup.yml @@ -7,14 +7,14 @@ become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: not devel|bool + when: env != 'staging' - name: reposync for centos shell: nohup retrace-server-reposync centos 7 x86_64 $(mktemp /tmp/ansible.reposync_for_centosXXXXXX.log) & become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: not devel|bool + when: env != 'staging' - file: path: /srv/retrace/repos