FBR : Disable F28 branched compose and enable two week atomic, cloud and container nightlies

[Mohan Boddu]

Now that we got a F28 RC final compose, we dont need branched composes anymore and also we
should enable two week atomic, cloud and container nightlies

diff --git a/roles/releng/files/branched b/roles/releng/files/branched
index e303942..b560be1 100644
--- a/roles/releng/files/branched
+++ b/roles/releng/files/branched
@@ -1,4 +1,4 @@
 # branched compose
 MAILTO=releng-cron(a)lists.fedoraproject.org
-15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR &&
git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git
checkout f28 && LANG=en_US.UTF-8 ./nightly.sh && sudo -u ftpsync
/usr/local/bin/update-fullfiletimelist -l
/pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary
+#15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR &&
git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git
checkout f28 && LANG=en_US.UTF-8 ./nightly.sh && sudo -u ftpsync
/usr/local/bin/update-fullfiletimelist -l
/pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary
 #15 1,14 * * * root TMPDIR=`mktemp -d /tmp/branched-modular.XXXXXX` && cd $TMPDIR
&& git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora
&& git checkout f27 && LANG=en_US.UTF-8 ./nightly-modular.sh
diff --git a/roles/releng/files/docker-updates b/roles/releng/files/docker-updates
index 5aef2f0..6d704af 100644
--- a/roles/releng/files/docker-updates
+++ b/roles/releng/files/docker-updates
@@ -1,3 +1,7 @@
+#Fedora 28 Docker Updates nightly compose
+MAILTO=releng-cron(a)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 27 Docker Updates nightly compose
 MAILTO=releng-cron(a)lists.fedoraproject.org
 45 7 * * * root TMPDIR=`mktemp -d /tmp/dockerF27.XXXXXX` && pushd $TMPDIR
&& git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora
&& git checkout f27 && LANG=en_US.UTF-8 ./docker-nightly.sh RC-$(date
"+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
@@ -5,7 +9,3 @@ MAILTO=releng-cron(a)lists.fedoraproject.org
 # Fedora 26 Docker Updates nightly compose
 MAILTO=releng-cron(a)lists.fedoraproject.org
 45 6 * * * root TMPDIR=`mktemp -d /tmp/dockerF26.XXXXXX` && pushd $TMPDIR
&& git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora
&& git checkout f26 && LANG=en_US.UTF-8 ./docker-nightly.sh RC-$(date
"+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
-
-#Fedora 25 Docker Updates nightly compose
-MAILTO=releng-cron(a)lists.fedoraproject.org
-#45 5 * * * root TMPDIR=`mktemp -d /tmp/dockerF25.XXXXXX` && pushd $TMPDIR
&& git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora
&& git checkout f25 && LANG=en_US.UTF-8 ./docker-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
index 6f4cf94..290d5f3 100644
--- a/roles/releng/files/twoweek-updates
+++ b/roles/releng/files/twoweek-updates
@@ -1,6 +1,6 @@
 #Fedora 28 two-week updates nightly compose
 #MAILTO=releng-cron(a)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
+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(a)lists.fedoraproject.org
@@ -13,3 +13,7 @@ MAILTO=releng-cron(a)lists.fedoraproject.org
 #Fedora 27 CloudImage nightly compose
 MAILTO=releng-cron(a)lists.fedoraproject.org
 15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudImageF27.XXXXXX` && pushd $TMPDIR
&& git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora
&& git checkout f27 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date
"+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
+
+#Fedora 28 CloudImage nightly compose
+MAILTO=releng-cron(a)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

[Kevin Fenzi]

+1

kevin

[Dusty Mabe]

On 04/26/2018 04:39 PM, Mohan Boddu wrote:
>  Now that we got a F28 RC final compose, we dont need branched
> composes anymore and also we should enable two week atomic, cloud and container nightlies
can we s/Docker/Container/ ? 

Also have those nightly scripts been updated for F28 appropriately?
I know the twoweek one should be good, but not sure about the others.

[Mohan Boddu]

On Thu, Apr 26, 2018 at 4:55 PM Dusty Mabe <dusty(a)dustymabe.com&gt; wrote:

>  On 04/26/2018 04:39 PM, Mohan Boddu wrote:
>  > Now that we got a F28 RC final compose, we dont need branched composes
>  anymore and also we should enable two week atomic, cloud and container
>  nightlies
>
>  can we s/Docker/Container/ ?
>  
I did that for just F28 release and planning to keep the old one's just
like that

>  Also have those nightly scripts been updated for F28 appropriately?
>  
Nope, I will work on them later today, before pushing this change.

>  I know the twoweek one should be good, but not sure about the
> others.
>

[Patrick マルタインアンドレアス Uiterwijk]

Looks reasonable to me, and easy to revert.
+1