diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 2d763cfe80..f1b91d205a 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -153,8 +153,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 F33 the compose location is going to be under /compose/branched/ - [% if release.version_int == 33 %] + # For F34 the compose location is going to be under /compose/branched/ + [% if release.version_int == 34 %] "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 ef049466c3..f8701aa6d6 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` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && /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` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && /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 d057085244..0a37b49159 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -1,11 +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 33 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF33.XXXXXX` && 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 32 Cloud nightly compose +# Fedora 32 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org 15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF32.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f32 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR -#Fedora 31 Cloud nightly compose +# Fedora 31 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org 15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates index a968205dbc..d3a0e142e9 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -2,9 +2,9 @@ MAILTO=releng-cron@lists.fedoraproject.org 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR -# 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 +# Fedora 33 Container Updates nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF33.XXXXXX` && 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 32 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org diff --git a/vars/all/00-FedoraCycleNumber.yaml b/vars/all/00-FedoraCycleNumber.yaml index acabe9c2f0..dd249b008e 100644 --- a/vars/all/00-FedoraCycleNumber.yaml +++ b/vars/all/00-FedoraCycleNumber.yaml @@ -1 +1 @@ -FedoraCycleNumber: 32 +FedoraCycleNumber: 33 diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 42ac5347b2..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 606eb2e208..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: prebeta +FedoraBranchedBodhi: current diff --git a/vars/all/RelEngFrozen.yaml b/vars/all/RelEngFrozen.yaml index 87d85f360b..5836689199 100644 --- a/vars/all/RelEngFrozen.yaml +++ b/vars/all/RelEngFrozen.yaml @@ -1 +1 @@ -RelEngFrozen: True +RelEngFrozen: False