From 41ca6546280110201a9c7bd0a2eb9373042f0820 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 23 Jun 2020 10:05:41 -0700 Subject: [PATCH] docs sync: adjust cron jobs and rsync script Right now we update translation files once a day at 22:00UTC. So, it makes no sense to generate the translated docs more often than once a day after that update. So, that cron moves to 23:00UTC. The en cron can be once per hour, run it before sync. Finally, adjust the docs-rsync script so it's actually idempotent, and only transfers as much as it needs to. Signed-off-by: Kevin Fenzi --- roles/fedora-docs/proxy/files/docs-rsync | 6 +++--- .../docsbuilding/templates/cron-translated.yml | 2 +- roles/openshift-apps/docsbuilding/templates/cron.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/fedora-docs/proxy/files/docs-rsync b/roles/fedora-docs/proxy/files/docs-rsync index ab161516c5..6329d65a91 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync +++ b/roles/fedora-docs/proxy/files/docs-rsync @@ -1,9 +1,9 @@ #!/bin/sh -/usr/bin/rsync -aSHPv -OJ --size-only --compare-dest /srv/web/docs-redirects/ --compare-dest /srv/web/docs-old.fedoraproject.org/public_html/ --compare-dest /srv/web/docs-combined/ --delete --delete-excluded --exclude=.git --exclude='copying.tmp/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ -/usr/bin/rsync -aSHPv -OJ --size-only --compare-dest /srv/web/docs.fedoraproject.org --compare-dest /srv/web/docs-old.fedoraproject.org/public_html/ --compare-dest /srv/web/docs-combined/ --delete --delete-excluded --exclude=.git --exclude='copying.tmp/' sundries01::docs-redirects/ /srv/web/docs-redirects/ +/usr/bin/rsync -aH --link-dest /srv/web/docs-redirects/ --link-dest /srv/web/docs-old.fedoraproject.org/public_html/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ +/usr/bin/rsync -aH --link-dest /srv/web/docs.fedoraproject.org --link-dest /srv/web/docs-old.fedoraproject.org/public_html/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs-redirects/ /srv/web/docs-redirects/ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130 -rsync -aH --delete --exclude=.git /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ +rsync -aH --delete --delete-after --exclude=.git /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ diff --git a/roles/openshift-apps/docsbuilding/templates/cron-translated.yml b/roles/openshift-apps/docsbuilding/templates/cron-translated.yml index 7dea0e3112..84b924f93e 100644 --- a/roles/openshift-apps/docsbuilding/templates/cron-translated.yml +++ b/roles/openshift-apps/docsbuilding/templates/cron-translated.yml @@ -4,7 +4,7 @@ metadata: name: cron-translated spec: concurrencyPolicy: Forbid - schedule: "0 * * * *" + schedule: "0 23 * * *" jobTemplate: spec: template: diff --git a/roles/openshift-apps/docsbuilding/templates/cron.yml b/roles/openshift-apps/docsbuilding/templates/cron.yml index 40c19ac66f..ab123d9760 100644 --- a/roles/openshift-apps/docsbuilding/templates/cron.yml +++ b/roles/openshift-apps/docsbuilding/templates/cron.yml @@ -4,7 +4,7 @@ metadata: name: cron spec: concurrencyPolicy: Forbid - schedule: "0 * * * *" + schedule: "50 * * * *" jobTemplate: spec: template: