fedora-infra / ansible

Clone
Source Code
GIT

#1619 Fedora 39 is GO
Merged 6 months ago by humaton. Opened 6 months ago by jnsamyak.
fedora-infra/ jnsamyak/ansible f39_final_release  into  main

file modified
+9 -9 
@@ -142,8 +142,8 @@ 
 

                      # 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 @@ 
 

                      # 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 @@ 
 

                      # 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 @@ 
 

          },
 

          [% 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 @@ 
 

                      # 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/"

file modified
+2 -2 
@@ -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

file modified
+5 -5 
@@ -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

file modified
+4 
@@ -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

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- FedoraCycleNumber: 38
 

+ FedoraCycleNumber: 39

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- FedoraBranched: True
 

+ FedoraBranched: False

file modified
+1 -1 
@@ -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

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- FedoraPreviousPrevious: False
 

+ FedoraPreviousPrevious: True

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- RelEngFrozen: True
 

+ RelEngFrozen: False

Signed-off-by: Samyak Jain samyak.jn11@gmail.com

1 new commit added

  • Update pungi.rpm config with 40 for all artifacts
6 months ago

rebased onto b143d03d7465f726137d677af4f813e417012808
6 months ago

rebased onto b143d03d7465f726137d677af4f813e417012808
6 months ago

I would think perhaps the pungi.rpm changes for f40 would be at branching time?

But it shouldn't matter, since bodhi won't be composing f40 until branching anyhow...

otherwise looks good to me.

rebased onto fabb4f4
6 months ago

rebased onto fabb4f4
6 months ago

Pull-Request has been merged by humaton
6 months ago
Metadata
None
No Tags
Changes Summary 9
+9 -9
file changed
roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+2 -2
file changed
roles/releng/files/branched
+5 -5
file changed
roles/releng/files/cloud-updates
+4 -0
file changed
roles/releng/files/container-updates
+1 -1
file changed
vars/all/00-FedoraCycleNumber.yaml
+1 -1
file changed
vars/all/FedoraBranched.yaml
+1 -1
file changed
vars/all/FedoraBranchedBodhi.yaml
+1 -1
file changed
vars/all/FedoraPreviousPrevious.yaml
+1 -1
file changed
vars/all/RelEngFrozen.yaml
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.