diff --git a/roles/s3-mirror/files/s3-sync-path.sh b/roles/s3-mirror/files/s3-sync-path.sh index 967ceb9b86..a9d43417c6 100644 --- a/roles/s3-mirror/files/s3-sync-path.sh +++ b/roles/s3-mirror/files/s3-sync-path.sh @@ -25,7 +25,6 @@ CMD="aws s3 sync \ --exclude *extras/* \ --exclude *LiveOS/* \ --exclude *development/rawhide/* \ - --exclude *releases/test/* \ --no-follow-symlinks \ --only-show-errors \ " diff --git a/roles/s3-mirror/files/s3.sh b/roles/s3-mirror/files/s3.sh index 38ea2f84a6..ea020a4c59 100644 --- a/roles/s3-mirror/files/s3.sh +++ b/roles/s3-mirror/files/s3.sh @@ -19,7 +19,6 @@ CMD="aws s3 sync \ --exclude */extras/* \ --exclude */LiveOS/* \ --exclude */development/rawhide/* \ - --exclude */releases/test/* \ --exclude */releases/8/* \ --exclude */releases/9/* \ --exclude */releases/10/* \ diff --git a/roles/s3-mirror/tasks/main.yml b/roles/s3-mirror/tasks/main.yml index 6573d6456c..5330b4539f 100644 --- a/roles/s3-mirror/tasks/main.yml +++ b/roles/s3-mirror/tasks/main.yml @@ -59,6 +59,14 @@ tags: - s3-mirror +- name: s3sync cron - test releases + cron: name="s3sync-updates-current" minute="40" hour="5,9,13,19" user="s3-mirror" + job='/usr/local/bin/lock-wrapper s3sync-test-releases "/usr/local/bin/s3-sync-path.sh /pub/fedora/linux/releases/test/" 2>&1 | /usr/local/bin/nag-once s3-test-releases.sh 1d 2>&1' + cron_file=s3-test-releases.sh + when: env != 'staging' and inventory_hostname.startswith('mm-backend01.') + tags: + - s3-mirror + - name: s3sync cron - updates for current cron: name="s3sync-updates-current" minute="0" hour="3,9,15,21" user="s3-mirror" job='/usr/local/bin/lock-wrapper s3sync-updates-current "/usr/local/bin/s3-sync-path.sh /pub/fedora/linux/updates/{{ FedoraCycleNumber|int }}/" 2>&1 | /usr/local/bin/nag-once s3-updates-current.sh 1d 2>&1'