From fabb4f492b07344e3d5de807348ea2730b0e8fb1 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Nov 03 2023 15:15:31 +0000 Subject: [PATCH 1/2] Fedora 39 is GO Signed-off-by: Samyak Jain --- diff --git a/roles/releng/files/branched b/roles/releng/files/branched index aa7b03f..0496512 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 f39 && /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 f39 && /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 42e0e44..cd63555 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -1,11 +1,11 @@ +# Fedora 39 Cloud nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +15 6 * * * root 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 + # Fedora 38 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org 15 7 * * * root 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 # Fedora 37 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org -15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF37.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f37 && 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 +15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF37.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f37 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR \ No newline at end of file diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates index 4a1ff25..4f662dc 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -1,3 +1,7 @@ +# Fedora 39 Container Updates nightly compose +MAILTO=releng-cron@lists.fedoraproject.org +45 7 * * * root 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 + # Fedora 38 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org 45 6 * * * root 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 diff --git a/vars/all/00-FedoraCycleNumber.yaml b/vars/all/00-FedoraCycleNumber.yaml index 0d15d52..9bd3df0 100644 --- a/vars/all/00-FedoraCycleNumber.yaml +++ b/vars/all/00-FedoraCycleNumber.yaml @@ -1 +1 @@ -FedoraCycleNumber: 38 +FedoraCycleNumber: 39 diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 2b54595..14b9982 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 ca2ba61..1e152cf 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 a8e3d3b..fd8779b 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 87d85f3..5836689 100644 --- a/vars/all/RelEngFrozen.yaml +++ b/vars/all/RelEngFrozen.yaml @@ -1 +1 @@ -RelEngFrozen: True +RelEngFrozen: False From 6e36c22ad526e2cca3e00320012dc1030d6f7858 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Nov 03 2023 15:15:31 +0000 Subject: [PATCH 2/2] Update pungi.rpm config with 40 for all artifacts Signed-off-by: Samyak Jain --- diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index c0142b2..dd45d8a 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -142,8 +142,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 F39 the compose location is going to be under /compose/branched/ - [% if release.version_int == 39 %] + # For F40 the compose location is going to be under /compose/branched/ + [% if release.version_int == 40 %] "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/" @@ -172,8 +172,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 F39 the compose location is going to be under /compose/branched/ - [% if release.version_int == 39 %] + # For F40 the compose location is going to be under /compose/branched/ + [% if release.version_int == 40 %] "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/" @@ -203,8 +203,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 F39 the compose location is going to be under /compose/branched/ - [% if release.version_int == 39 %] + # For F40 the compose location is going to be under /compose/branched/ + [% if release.version_int == 40 %] "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/" @@ -222,7 +222,7 @@ ostree = { }, [% endif %] # Fedora Onyx - [% if release.version_int >= 39 %] + [% if release.version_int >= 40 %] { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "treefile": "fedora-onyx.yaml", @@ -234,8 +234,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 F39 the compose location is going to be under /compose/branched/ - [% if release.version_int == 39 %] + # For F40 the compose location is going to be under /compose/branched/ + [% if release.version_int == 40 %] "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/"