[PATCH 1/5] bodhi-pungi: f29 will be new branched target [PATCH 2/5] bodhi-pungi: convert image-build to use non branched [PATCH 3/5] bodhi-pungi: only provide one repo to lorax [PATCH 4/5] bodhi-pungi: s/Atomic/AtomicHost/ [PATCH 5/5] bodhi-pungi: add vagrant box creation
The commit messages should give a good idea of what is related to each one. The biggest thing is working around a lorax/dnf bug for now in patch 3.
f28 is no longer under branched. Pick up new branched target from f29 when that gets here. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 15932ed23..1b02fd2df 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -127,8 +127,8 @@ ostree = { # In the case of testing, also inject the last stable updates "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", [% endif %] - # For f28 the compose location is under /compose/branched/ - [% if release.version_int == 28 %] + # 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-[[ release.version_int ]]/compose/Everything/$basearch/os/" [% else %] "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" @@ -223,8 +223,8 @@ ostree_installer = [ # In the case of testing, also inject the last stable updates "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/[[arch]]/os/", [% endif %] - # For f28 the compose location is under /compose/branched/ - [% if release.version_int == 28 %] + # 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-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" [% else %] "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/"
Need to move it to use non-branched location for f28. Added the if/else for future when we start using branched f29. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 1b02fd2df..26846fc3b 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -205,7 +205,13 @@ image_build = { 'disk_size': 6, 'target': 'f[[ release.version_int ]]', 'arches': ['x86_64', 'aarch64', 'ppc64le'], - 'install_tree_from': "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/" + 'install_tree_from': + # 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-[[ release.version_int ]]/compose/Everything/$arch/os/", + [% else %] + "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/", + [% endif %] 'subvariant': 'AtomicHost', 'failable': ['*'], }
Because of a bug in DNF lorax can't handle being given multiple repos as input. For now just go with release day repo. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 26846fc3b..cfa0ce5f0 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -224,11 +224,13 @@ ostree_installer = [ [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] '[[ arch ]]': { "repo": [ - "Everything", - [% if request.name == 'testing' %] - # In the case of testing, also inject the last stable updates - "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/[[arch]]/os/", - [% endif %] + # 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%7B%7B env_suffix }}.fedoraproject.org/compose/updates/f[[ 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-[[ release.version_int ]]/compose/Everything/[[arch]]/os/"
--- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index cfa0ce5f0..a44334498 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -199,7 +199,7 @@ image_build = { { 'image-build': { 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')], - 'name': 'Fedora-Atomic', + 'name': 'Fedora-AtomicHost', 'kickstart': 'fedora-atomic.ks', 'distro': 'Fedora-22', 'disk_size': 6,
Since we are close to being able to do releases from the bodhi composes let's create the vagrant boxes too so that we actually *can* do a release. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index a44334498..8a489ae44 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -215,6 +215,29 @@ image_build = { 'subvariant': 'AtomicHost', 'failable': ['*'], } + }, + { + 'image-build': { + 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')], + 'name': 'Fedora-AtomicHost-Vagrant', + 'kickstart': 'fedora-atomic-vagrant.ks', + 'distro': 'Fedora-22', + 'disk_size': 40, + 'target': 'f[[ release.version_int ]]', + 'arches': ['x86_64'], + 'install_tree_from': + # 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-[[ release.version_int ]]/compose/Everything/$arch/os/", + [% else %] + "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/", + [% endif %] + 'subvariant': 'AtomicHost', + 'failable': ['*'], + }, + 'factory-parameters': { + 'vagrant_sync_directory': '/home/vagrant/sync', + } } ] }
On 06/01/2018 06:58 AM, Dusty Mabe wrote:
[PATCH 1/5] bodhi-pungi: f29 will be new branched target [PATCH 2/5] bodhi-pungi: convert image-build to use non branched [PATCH 3/5] bodhi-pungi: only provide one repo to lorax [PATCH 4/5] bodhi-pungi: s/Atomic/AtomicHost/ [PATCH 5/5] bodhi-pungi: add vagrant box creation
The commit messages should give a good idea of what is related to each one. The biggest thing is working around a lorax/dnf bug for now in patch 3.
Cool. Thanks for sending these. ;)
Looks good to me. +1
kevin
LGTM +1 But, can we add a branched release variable, so that we dont need to add the branch release version multiple times at different places?
On Fri, Jun 1, 2018 at 4:06 PM Kevin Fenzi kevin@scrye.com wrote:
On 06/01/2018 06:58 AM, Dusty Mabe wrote:
[PATCH 1/5] bodhi-pungi: f29 will be new branched target [PATCH 2/5] bodhi-pungi: convert image-build to use non branched [PATCH 3/5] bodhi-pungi: only provide one repo to lorax [PATCH 4/5] bodhi-pungi: s/Atomic/AtomicHost/ [PATCH 5/5] bodhi-pungi: add vagrant box creation
The commit messages should give a good idea of what is related to each one. The biggest thing is working around a lorax/dnf bug for now in patch 3.
Cool. Thanks for sending these. ;)
Looks good to me. +1
kevin
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedorapro...
On 06/01/2018 04:34 PM, Mohan Boddu wrote:
LGTM +1
thanks. merged and playbook ran
But, can we add a branched release variable, so that we dont need to add the branch release version multiple times at different places?
Mohan is going to show me an example of this so I can see how it would be implemented.
Dusty
On Fri, Jun 1, 2018 at 2:58 PM, Dusty Mabe dusty@dustymabe.com wrote:
[PATCH 1/5] bodhi-pungi: f29 will be new branched target [PATCH 2/5] bodhi-pungi: convert image-build to use non branched [PATCH 3/5] bodhi-pungi: only provide one repo to lorax [PATCH 4/5] bodhi-pungi: s/Atomic/AtomicHost/ [PATCH 5/5] bodhi-pungi: add vagrant box creation
The commit messages should give a good idea of what is related to each one. The biggest thing is working around a lorax/dnf bug for now in patch 3.
Got a reference to the lorax/dnf bug reports?
On 06/03/2018 10:11 AM, Peter Robinson wrote:
On Fri, Jun 1, 2018 at 2:58 PM, Dusty Mabe dusty@dustymabe.com wrote:
[PATCH 1/5] bodhi-pungi: f29 will be new branched target [PATCH 2/5] bodhi-pungi: convert image-build to use non branched [PATCH 3/5] bodhi-pungi: only provide one repo to lorax [PATCH 4/5] bodhi-pungi: s/Atomic/AtomicHost/ [PATCH 5/5] bodhi-pungi: add vagrant box creation
The commit messages should give a good idea of what is related to each one. The biggest thing is working around a lorax/dnf bug for now in patch 3.
Got a reference to the lorax/dnf bug reports?
yep. I added it in the code: https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/bodhi2/...
infrastructure@lists.fedoraproject.org
-
Dusty Mabe -
Kevin Fenzi -
Mohan Boddu -
Peter Robinson