From 7e501dcb9432885c9ef10e78c0418b0d40c85061 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Fri, 25 Oct 2024 23:17:53 +0530 Subject: [PATCH] Fedora 41 is GO Signed-off-by: Samyak Jain --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 4 ++-- roles/releng/files/branched | 4 ++-- roles/releng/files/cloud-updates | 8 ++++---- roles/releng/files/container-updates | 8 ++++---- vars/all/00-FedoraCycleNumber.yaml | 2 +- vars/all/FedoraBranched.yaml | 2 +- vars/all/FedoraBranchedBodhi.yaml | 2 +- vars/all/FedoraPreviousPrevious.yaml | 2 +- vars/all/RelEngFrozen.yaml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index a79bce2f2c..9482ab63e7 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -133,8 +133,8 @@ createiso_skip = [ [# In the case of testing, also inject the last stable updates #] "https://kojipkgs{env_suffix}.fedoraproject.org/compose/updates/f[[ release.version ]]-updates/compose/Everything/$basearch/os/", [% endif %] - [% if release.version == "41" %] - [# For F41 the compose location is going to be under /compose/branched/ #] + [% if release.version == "42" %] + [# For F42 the compose location is going to be under /compose/branched/ #] "https://kojipkgs{env_suffix}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version ]]/compose/Everything/$basearch/os/" [% else %] "https://kojipkgs{env_suffix}.fedoraproject.org/compose/[[ release.version ]]/latest-Fedora-[[ release.version ]]/compose/Everything/$basearch/os/" diff --git a/roles/releng/files/branched b/roles/releng/files/branched index 6f3f3ab712..d07834dd40 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 touch /tmp/fedora-compose-branched && TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && /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 && rm /tmp/fedora-compose-branched +# MAILTO=releng-cron@lists.fedoraproject.org +# 15 7 * * * root touch /tmp/fedora-compose-branched && TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && /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 && rm /tmp/fedora-compose-branched diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates index a3e214dfe3..f8f0e113bc 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -1,3 +1,7 @@ +# Fedora 41 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 7 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF41.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates + # Fedora 40 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org 15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF40.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR @@ -5,7 +9,3 @@ MAILTO=releng-cron@lists.fedoraproject.org # Fedora 39 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org 15 6 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF39.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f39 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates - -# Fedora 38 Cloud nightly compose -# MAILTO=releng-cron@lists.fedoraproject.org -# 15 7 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF38.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f38 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates index 3b84c3b26d..3c0c7bca4d 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -1,3 +1,7 @@ +# Fedora 41 Container Updates nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +45 6 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF41.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates + #Fedora 40 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF40.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR @@ -5,7 +9,3 @@ MAILTO=releng-cron@lists.fedoraproject.org # Fedora 39 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org 45 7 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF39.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f39 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates - -# Fedora 38 Container Updates nightly compose -# MAILTO=releng-cron@lists.fedoraproject.org -# 45 6 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF38.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f38 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates \ No newline at end of file diff --git a/vars/all/00-FedoraCycleNumber.yaml b/vars/all/00-FedoraCycleNumber.yaml index c0e54be706..371ffc61ed 100644 --- a/vars/all/00-FedoraCycleNumber.yaml +++ b/vars/all/00-FedoraCycleNumber.yaml @@ -1 +1 @@ -FedoraCycleNumber: 40 +FedoraCycleNumber: 41 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/FedoraPreviousPrevious.yaml b/vars/all/FedoraPreviousPrevious.yaml index a8e3d3b4bc..fd8779bd0d 100644 --- a/vars/all/FedoraPreviousPrevious.yaml +++ b/vars/all/FedoraPreviousPrevious.yaml @@ -1 +1 @@ -FedoraPreviousPrevious: False +FedoraPreviousPrevious: True 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