fedora-infra / ansible

Clone
Source Code
GIT

#2473 Branch epel10.0 from epel10
Merged 3 months ago by jnsamyak. Opened 3 months ago by carlwgeorge.
fedora-infra/ carlwgeorge/ansible epel10.0-branching  into  main

file modified
+1 -1 
@@ -23,4 +23,4 @@ 
 

  # resembles RHEL 10.0 for the epel10.0-build tag to use temporarily until the
 

  # actual RHEL 10.0 is released.
 

  # https://pagure.io/fedora-infrastructure/issue/12394
 

- ${RSYNC} ${RS_OPT} ${RS_DEADLY} --link-dest=${RSYNC_DESTDIR} ${RSYNC_DESTDIR} ${RSYNC_SNAPDIR}
 

+ #${RSYNC} ${RS_OPT} ${RS_DEADLY} --link-dest=${RSYNC_DESTDIR} ${RSYNC_DESTDIR} ${RSYNC_SNAPDIR}

file modified
+16 -2 
@@ -152,18 +152,32 @@ 
 

                                  'dest': os.path.join(FEDORAALTDEST, 'testing', '40', 'Everything')}
 

                                ]}}
 

                     },
 

+             'epel10.1': {'topic': 'epel',
 

+                          'version': '10.1',
 

+                          'modules': ['epel'],
 

+                          'repos': {'epel': {
 

+                              'from': 'epel10.1',
 

+                              'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
 

+                                      'dest': os.path.join(EPELDEST, '10', 'Everything')},
 

+                                    ]},
 

+                                    'epel-testing': {
 

+                              'from': 'epel10.1-testing',
 

+                              'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
 

+                                      'dest': os.path.join(EPELDEST, 'testing', '10', 'Everything')},
 

+                                    ]}}
 

+                         },
 

              'epel10.0': {'topic': 'epel',
 

                           'version': '10.0',
 

                           'modules': ['epel'],
 

                           'repos': {'epel': {
 

                               'from': 'epel10.0',
 

                               'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
 

-                                      'dest': os.path.join(EPELDEST, '10', 'Everything')},
 

+                                      'dest': os.path.join(EPELDEST, '10.0', 'Everything')},
 

                                     ]},
 

                                     'epel-testing': {
 

                               'from': 'epel10.0-testing',
 

                               'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
 

-                                      'dest': os.path.join(EPELDEST, 'testing', '10', 'Everything')},
 

+                                      'dest': os.path.join(EPELDEST, 'testing', '10.0', 'Everything')},
 

                                     ]}}
 

                          },
 

              'epel9': {'topic': 'epel',

file modified
+1 -1 
@@ -116,7 +116,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 f43 f42 f41 f40 epel10.0 epel9 epel9-next epel8'"
 

+       job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f43 f42 f41 f40 epel10.1 epel10.0 epel9 epel9-next epel8'"
 

        cron_file=update-koji-owner
 

        user=apache
 

    when: env == "production"

file modified
+1 
@@ -51,6 +51,7 @@ 
 

      "f39",
 

      "f39-container",
 

      "f39-flatpak",
 

+     "epel10.1",
 

      "epel10.0",
 

      "epel9",
 

      "epel9-next",

file modified
+2 -1 
@@ -211,7 +211,7 @@ 
 

          # Stable releases: only adding and unblocking is allowed.
 

          tag f{{FedoraCycleNumber}} f{{FedoraPreviousCycleNumber}} && match action add unblock :: allow
 

          # EPEL: adding, blocking, and unblocking are allowed 

-         tag epel8 epel9 epel9-next epel10.0 && match action add unblock block :: allow	

+         tag epel8 epel9 epel9-next epel10.0 epel10.1 && match action add unblock block :: allow
 

      }
 

      # Infra people can themselves add/block/unblock packages in their
 

      # tags without bothering admins.
 
@@ -232,6 +232,7 @@ 
 

      tag f40-build :: allow
 

      tag f39-build :: allow
 

      tag eln-build :: allow
 

+     tag epel10.1-build :: allow
 

      tag epel10.0-build :: allow
 

      tag epel9-next-build :: allow
 

      tag epel9-build :: allow

file modified
+12 
@@ -256,6 +256,18 @@ 
 

              # Gated bodhi updates
 

  

              [[consumer_config.koji_instances.primary.tags]]
 

+             from = "epel10.1-signing-pending"
 

+             to = "epel10.1-testing-pending"
 

+             key = "{{ (env == 'production')|ternary('epel-10', 'testkey') }}"
 

+             keyid = "{{ (env == 'production')|ternary('e37ed158', 'd300e724') }}"
 

+ 

+             [consumer_config.koji_instances.primary.tags.sidetags]
 

+             pattern = 'epel10.1-build-side-<seq_id>'
 

+             from = '<sidetag>-signing-pending'
 

+             to = '<sidetag>-testing-pending'
 

+             trusted_taggers = ['bodhi']
 

+ 

+             [[consumer_config.koji_instances.primary.tags]]
 

              from = "epel10.0-signing-pending"
 

              to = "epel10.0-testing-pending"
 

              key = "{{ (env == 'production')|ternary('epel-10', 'testkey') }}"

Signed-off-by: Carl George carlwgeorge@gmail.com

rebased onto 3602ac8
3 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/7836039cfd7c42d9bcf6268507aebf88

Looks pretty reasonable...

Possibly needs adding 10.1 to sidetags in roles/koji_hub/templates/hub.conf.j2 ?

This does add tag epel10.1-build :: allow to the sidetag list in hub.conf.j2, is there another spot you're referring to?

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/9c1ac55dc250407b8f9e8415f0dc8a9b

rebased onto a842016
3 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/f95eb2fd44ac4082b4a193b18d5336fa

these changes looks good to me +1

Pull-Request has been merged by jnsamyak
3 months ago
Metadata
None
No Tags
Changes Summary 6
+1 -1
file changed
roles/batcave/files/centos-10-sync
+16 -2
file changed
roles/bodhi2/backend/files/new-updates-sync
+1 -1
file changed
roles/bodhi2/backend/tasks/main.yml
+1 -0
file changed
roles/bodhi2/backend/templates/koji_sync_listener.toml
+2 -1
file changed
roles/koji_hub/templates/hub.conf.j2
+12 -0
file changed
roles/robosignatory/templates/robosignatory.toml.j2
Powered by Pagure 5.14.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.