#9703 Adding flatpak release during branching
Merged 4 months ago by mohanboddu. Opened 4 months ago by mohanboddu.
mohanboddu/releng mass-branching-flatpak  into  master

@@ -179,7 +179,7 @@ 

           sys.stdout.flush()

           # XXX If you modify this taglist.  Please also modify the other copy in

           # bodhi2/backend/tasks/main.yml

-     -    taglist = 'f32 f32-container f32-modular f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'

+     -    taglist = 'f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'

      +    taglist = 'f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'

          cmd = [

              '/usr/local/bin/owner-sync-pagure',
@@ -249,7 +249,7 @@ 

         # bodhi2/backend/files/koji-sync-listener.py

         # This cronjob runs only once a day.  The listener script runs reactively.

         cron: name="owner-sync" minute="15" hour="4" user="root"

-     -      job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f32 f32-container f32-modular f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"

+     -      job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"

      +      job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"

             cron_file=update-koji-owner

         when: env == "production"
@@ -297,6 +297,22 @@ 

       ## Buildroot Override

       ##

  

+     diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml

+     --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml

+     +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml

+     @@ -36,6 +36,10 @@ arguments = {}

+     # XXX If you modify this taglist.  Please also modify the other copy in

+     # bodhi2/backend/tasks/main.yml

+     taglist = [

+     +     "f34",

+     +     "f34-container",

+     +     "f34-modular",

+     +     "f34-flatpak",

+           "f33",

+           "f33-container",

+           "f33-modular",

+ 

+ 

  Greenwave

  ^^^^^^^^^

  
@@ -941,6 +957,12 @@ 

  

      $ bodhi releases create --name "F32" --long-name "Fedora 32" --id-prefix FEDORA --version 32 --branch f32 --dist-tag f32 --stable-tag f32 --testing-tag f32-updates-testing --candidate-tag f32-updates-candidate --pending-stable-tag f32-updates-pending --pending-testing-tag f32-updates-testing-pending --pending-signing-tag f32-signing-pending --state pending --override-tag f32-override --create-automatic-updates --not-composed-by-bodhi

  

+ To create a flatpak release in bodhi, you need to run

+ 

+ ::

+ 

+     $ bodhi releases create --name "F32F" --long-name "Fedora 32 Flatpaks" --id-prefix FEDORA-FLATPAK --version 32 --branch f32 --dist-tag f32-flatpak --stable-tag f32-flatpak-updates --testing-tag f32-flatpak-updates-testing --candidate-tag f32-flatpak-updates-candidate --pending-stable-tag f32-flatpak-updates-pending --pending-testing-tag f32-flatpak-updates-testing-pending --state pending --override-tag f32-flatpak-override

+ 

  You need to run the ``bodhi openshift`` playbook, so that UI will know about the new release.

  Then, you need to restart **fm-consumer@config.service** and **bodhi-celery.service** services on

  **bodhi-backend01.phx2.fedoraproject.org**
@@ -1057,4 +1079,4 @@ 

  .. _block_retired.py:

      https://pagure.io/releng/blob/master/f/scripts/block_retired.py

  .. _block_retired.py commit:

-     https://pagure.io/releng/c/9eb97f491f7a767ab8b90498adfa3b34ee235247?branch=master 

\ No newline at end of file

+     https://pagure.io/releng/c/9eb97f491f7a767ab8b90498adfa3b34ee235247?branch=master

@@ -116,6 +116,22 @@ 

  # https://pagure.io/releng/issue/9256

  "${KOJICLI}" list-pkgs --tag "f${old_release}" --noinherit | grep '^rust-' | grep -Pv '(rust-packaging|rust-srpm-macros)' | awk '{print $1}' | xargs -n16 -P4 "${KOJICLI}" untag-build "f${old_release}" --all -v

  

+ # Set up a corresponding set of tags for flatpaks.

+ # They are only setup for branched release.

+ old_flatpak_release=${old_release}-flatpak

+ older_release=$(bc -l <<< "${old_release}-1")

+ "${KOJICLI}" add-tag "f${old_flatpak_release}"

+ "${KOJICLI}" add-tag --parent "f${old_flatpak_release}" "f${old_flatpak_release}-updates"

+ "${KOJICLI}" add-tag --parent "f${old_flatpak_release}-updates" "f${old_flatpak_release}-updates-candidate"

+ "${KOJICLI}" add-tag --parent "f${old_flatpak_release}-updates" "f${old_flatpak_release}-updates-testing"

+ "${KOJICLI}" add-tag --parent "f${old_flatpak_release}-updates-testing" "f${old_flatpak_release}-updates-testing-pending"

+ "${KOJICLI}" add-tag --parent "f${old_flatpak_release}-updates" "f${old_flatpak_release}-updates-pending"

+ "${KOJICLI}" add-tag --parent "f${old_flatpak_release}-updates" "f${old_flatpak_release}-override"

+ "${KOJICLI}" add-target "f${old_flatpak_release}"-candidate "f${old_release}"-build "f${old_flatpak_release}"-updates-candidate

+ # Add packages from the stable release

+ flatpak_pkgs=$(koji list-pkgs --quiet --tag="f${older_release}-flatpak" | awk '{ print $1}')

+ "${KOJICLI}" add-pkg --owner=releng "f${old_flatpak_release}" $flatpak_pkgs

+ 

  # Point eln to new rawhide release

  "${KOJICLI}" remove-tag-inheritance eln "f${old_release}"

  "${KOJICLI}" add-tag-inheritance eln "f${release}"

rebased onto 69c4df8

4 months ago

Pull-Request has been merged by mohanboddu

4 months ago