diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 78dd9dfafd..6c564b0881 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -164,8 +164,8 @@ ostree = { # In the case of testing, also inject the last stable updates "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", [% endif %] - # For F36 the compose location is going to be under /compose/branched/ - [% if release.version_int == 36 %] + # For F37 the compose location is going to be under /compose/branched/ + [% if release.version_int == 37 %] "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" [% else %] "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" diff --git a/roles/releng/files/branched b/roles/releng/files/branched index b70141e3e7..a6dced2ca0 100644 --- a/roles/releng/files/branched +++ b/roles/releng/files/branched @@ -1,3 +1,3 @@ # branched compose -MAILTO=releng-cron@lists.fedoraproject.org -15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && /usr/local/bin/lock-wrapper branched-compose "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 +#MAILTO=releng-cron@lists.fedoraproject.org +#15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && /usr/local/bin/lock-wrapper branched-compose "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 diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates index e52e3767c9..2c939db0fb 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -1,6 +1,6 @@ -# Fedora 33 Cloud nightly compose -#MAILTO=releng-cron@lists.fedoraproject.org -#15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF33.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR +# Fedora 36 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 35 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates index ef65aa2d06..bb856d63aa 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -2,10 +2,10 @@ MAILTO=releng-cron@lists.fedoraproject.org 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF34.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f34 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR -# Fedora 33 Container Updates nightly compose -#MAILTO=releng-cron@lists.fedoraproject.org -#45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF33.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR - # Fedora 35 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org 45 6 * * * root TMPDIR=`mktemp -d /tmp/containerF35.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f35 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR + +# Fedora 36 Container Updates nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR diff --git a/vars/all/00-FedoraCycleNumber.yaml b/vars/all/00-FedoraCycleNumber.yaml index 77ec42de28..ecc34e5b81 100644 --- a/vars/all/00-FedoraCycleNumber.yaml +++ b/vars/all/00-FedoraCycleNumber.yaml @@ -1 +1 @@ -FedoraCycleNumber: 35 +FedoraCycleNumber: 36 diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 2b54595267..14b99820be 100644 --- a/vars/all/FedoraBranched.yaml +++ b/vars/all/FedoraBranched.yaml @@ -1 +1 @@ -FedoraBranched: True +FedoraBranched: False diff --git a/vars/all/FedoraBranchedBodhi.yaml b/vars/all/FedoraBranchedBodhi.yaml index ca2ba61079..1e152cfba7 100644 --- a/vars/all/FedoraBranchedBodhi.yaml +++ b/vars/all/FedoraBranchedBodhi.yaml @@ -3,4 +3,4 @@ # prebeta: After bodhi enablement/beta freeze and before beta release # postbeta: After beta release and before final release # current: After final release -FedoraBranchedBodhi: postbeta +FedoraBranchedBodhi: current diff --git a/vars/all/RelEngFrozen.yaml b/vars/all/RelEngFrozen.yaml index bd7553fb7f..72af77976d 100644 --- a/vars/all/RelEngFrozen.yaml +++ b/vars/all/RelEngFrozen.yaml @@ -1 +1 @@ -RelEngFrozen: True +RelEngFrozen: False