From d131a660e5ec2f53ade9ef57e6e7479bd4bf3b6a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 23 Apr 2021 16:02:07 -0400 Subject: [PATCH] F34 is GA Signed-off-by: Mohan Boddu --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 4 ++-- roles/releng/files/branched | 4 ++-- roles/releng/files/cloud-updates | 6 +++--- roles/releng/files/container-updates | 6 +++--- vars/all/00-FedoraCycleNumber.yaml | 2 +- vars/all/FedoraBranched.yaml | 2 +- vars/all/FedoraBranchedBodhi.yaml | 2 +- vars/all/RelEngFrozen.yaml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index a0e3f9c1a0..d4972f1542 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -157,8 +157,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 F34 the compose location is going to be under /compose/branched/ - [% if release.version_int == 34 %] + # For F35 the compose location is going to be under /compose/branched/ + [% if release.version_int == 35 %] "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 cd4ad8d10f..31179e7fa7 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 f34 && /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 f34 && /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 ccc6a8e283..2cfc2a5a08 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -6,6 +6,6 @@ MAILTO=releng-cron@lists.fedoraproject.org MAILTO=releng-cron@lists.fedoraproject.org 15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF32.XXXXXX` && chmod 755 $TMPDIR && 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 -#MAILTO=releng-cron@lists.fedoraproject.org -#15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF31.XXXXXX` && chmod 755 $TMPDIR && 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 +# Fedora 34 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF34.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 ./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 473d504ef1..752c76ce63 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -1,6 +1,6 @@ -#Fedora 31 Container Updates nightly compose -#MAILTO=releng-cron@lists.fedoraproject.org -#45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF31.XXXXXX` && chmod 755 $TMPDIR && 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 34 Container Updates nightly compose +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 diff --git a/vars/all/00-FedoraCycleNumber.yaml b/vars/all/00-FedoraCycleNumber.yaml index dd249b008e..d1ec27ffd8 100644 --- a/vars/all/00-FedoraCycleNumber.yaml +++ b/vars/all/00-FedoraCycleNumber.yaml @@ -1 +1 @@ -FedoraCycleNumber: 33 +FedoraCycleNumber: 34 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 87d85f360b..5836689199 100644 --- a/vars/all/RelEngFrozen.yaml +++ b/vars/all/RelEngFrozen.yaml @@ -1 +1 @@ -RelEngFrozen: True +RelEngFrozen: False