Re: [FBR] Include updates-testing repo during bodhi u-t run

On Fri, Oct 26, 2018 at 7:07 PM Dusty Mabe dusty@dustymabe.com wrote:

On 10/25/2018 01:25 PM, Sinny Kumari wrote:

...

Hi,

Here is a patch (available in email attachment) to include

updates-testing repo

...

as well during Atomic Host ISO creation in bodhi updates-testing run.

Specifying

...

multiple repos to lorax should work fine on Fedora >=29 - https://github.com/weldr/lorax/issues/368 .

Can I get +1 for the patch?

Thanks, Sinny

Suggested change below. I think we just need to uncomment out the commented out code right above the lines you changed.

Thanks Dusty for reviewing it!

- updates run will run lorax against

- Everything
    - the current updates run

+1

- https://kojipkgs%7B%7B env_suffix }}.

fedoraproject.org/compose/branched/latest-Fedora-[[ http://fedoraproject.org/compose/branched/latest-Fedora-%5B%5B release.version_int ]]/compose/Everything/[[arch]]/os/ - the release day repo

With RC 1.2 being Gold, does it make sense to make this https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/ ?

• updates-testing will run lorax against
  • Everything
    • the current updates-testing run
  • https://kojipkgs%7B%7B env_suffix }}.

fedoraproject.org/compose/branched/latest-Fedora-[[ http://fedoraproject.org/compose/branched/latest-Fedora-%5B%5B release.version_int ]]/compose/Everything/[[arch]]/os/ - the release day repo - https://kojipkgs%7B%7B env_suffix }}. fedoraproject.org/compose/updates/f[[ http://fedoraproject.org/compose/updates/f%5B%5B release.version_int ]]-updates/compose/Everything/[[arch]]/os/ - the last updates run

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index af3f5ea29..91f8535aa 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -292,13 +292,11 @@ ostree_installer = [ [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] '[[ arch ]]': { "repo": [

•                # For now we need to only provide one repo to lorax
  

•                # See https://github.com/weldr/lorax/issues/368
  

•                #   "Everything",
  

•                #   [% if request.name == 'testing' %]
  

•                #       # In the case of testing, also inject the
  

last stable updates

•                #       "https://kojipkgs{{ env_suffix }}.
  

fedoraproject.org/compose/updates/f[[ http://fedoraproject.org/compose/updates/f%5B%5B release.version_int ]]-updates/compose/Everything/[[arch]]/os/",

•                #   [% endif %]
  

•                "Everything",
  

•                [% if request.name == 'testing' %]
  

•                    # In the case of testing, also inject the last
  

stable updates

•                    "https://kojipkgs{{ env_suffix }}.
  

fedoraproject.org/compose/updates/f[[ http://fedoraproject.org/compose/updates/f%5B%5B release.version_int ]]-updates/compose/Everything/[[arch]]/os/",

•                [% endif %]
                 # For f29 the compose location is under
  

/compose/branched/ [% if release.version_int == 29 %] "https://kojipkgs%7B%7B env_suffix }}. fedoraproject.org/compose/branched/latest-Fedora-[[ http://fedoraproject.org/compose/branched/latest-Fedora-%5B%5B release.version_int ]]/compose/Everything/[[arch]]/os/"