From 1e63bb9cf13db6be107bb1d85bcfdfc805af8c83 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 23 May 2019 18:28:58 +0000 Subject: [PATCH] releng: rename and clean up cloud and container crons and times Signed-off-by: Kevin Fenzi --- roles/releng/files/cloud-updates | 11 ++++++++++ .../{docker-updates => container-updates} | 2 +- roles/releng/files/twoweek-updates | 21 ------------------- roles/releng/tasks/main.yml | 8 +++---- 4 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 roles/releng/files/cloud-updates rename roles/releng/files/{docker-updates => container-updates} (95%) delete mode 100644 roles/releng/files/twoweek-updates diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates new file mode 100644 index 0000000000..1bc4afe6b9 --- /dev/null +++ b/roles/releng/files/cloud-updates @@ -0,0 +1,11 @@ +#Fedora 30 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR + +#Fedora 29 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF29.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f29 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR + +#Fedora 28 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF28.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f28 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR diff --git a/roles/releng/files/docker-updates b/roles/releng/files/container-updates similarity index 95% rename from roles/releng/files/docker-updates rename to roles/releng/files/container-updates index 41c4b9402d..504b50b69f 100644 --- a/roles/releng/files/docker-updates +++ b/roles/releng/files/container-updates @@ -2,7 +2,7 @@ MAILTO=releng-cron@lists.fedoraproject.org 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF28.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f28 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR -# Fedora 30 Docker Updates nightly compose +# Fedora 30 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org 45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR diff --git a/roles/releng/files/twoweek-updates b/roles/releng/files/twoweek-updates deleted file mode 100644 index 0d6ceab8ce..0000000000 --- a/roles/releng/files/twoweek-updates +++ /dev/null @@ -1,21 +0,0 @@ -#Fedora 28 two-week updates nightly compose -# XXX: this has been moved to the updates compose: -# https://kojipkgs.fedoraproject.org/compose/updates/f28-updates/ -#MAILTO=releng-cron@lists.fedoraproject.org -#15 8 * * * root TMPDIR=`mktemp -d /tmp/twoweekF28.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f28 && LANG=en_US.UTF-8 ./twoweek-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR - -#Fedora 27 two-week updates nightly compose -#MAILTO=releng-cron@lists.fedoraproject.org -#15 5 * * * root TMPDIR=`mktemp -d /tmp/twoweekF27.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f27 && LANG=en_US.UTF-8 ./twoweek-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR - -#Fedora 30 Cloud nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 5 * * * root TMPDIR=`mktemp -d /tmp/CloudF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR - -#Fedora 29 Cloud nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF29.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f29 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR - -#Fedora 28 Cloud nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF28.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f28 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index ef86e1d0bd..c43feb4250 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -137,14 +137,14 @@ copy: src="rawhide" dest=/etc/cron.d/rawhide when: inventory_hostname.startswith('rawhide-composer') -# put cron job in for two-week nightly compose -- name: twoweek compose cron - copy: src="twoweek-updates" dest=/etc/cron.d/twoweek-updates +# put cron job in for cloud nightly compose +- name: cloud updates compose cron + copy: src="cloud-updates" dest=/etc/cron.d/cloud-updates when: inventory_hostname.startswith('compose-x86-01') # put cron job in for docker nightly compose - name: docker compose cron - copy: src="docker-updates" dest=/etc/cron.d/docker-updates + copy: src="container-updates" dest=/etc/cron.d/container-updates when: inventory_hostname.startswith('compose-x86-01') - name: install compose /etc/httpd/conf.d/compose.conf file