This is an attempt to fix https://pagure.io/dusty/failed-composes/issue/176
I'd like to get patrick and one other person to review these changes.
Since $basearch won't work in the url we need to manually substitute arch. Make a for loop and specify a unique url for each arch. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index d3ab5981a..e318959d1 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -196,6 +196,7 @@ volume_id_substitutions = { image_build = { '^Everything$': [ { + [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] 'image-build': { 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')], 'name': 'Fedora-Atomic', @@ -203,11 +204,12 @@ image_build = { 'distro': 'Fedora-22', '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/$basearch/os/" + 'arches': ['[[arch]]'], + 'install_tree_from': "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" 'subvariant': 'AtomicHost', 'failable': ['*'], - } + }, + [% endfor %] } ] }
The compose today failed with:
``` [WARNING ] [OSTREE_INSTALLER] Patterns in config do not match any variant: ^Atomic$ ```
There is no Atomic variant any longer. Let's use AtomicHost instead, which will sync it up with what is done inthe pungi-fedora repo. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index e318959d1..b7c4bd529 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -194,7 +194,7 @@ volume_id_substitutions = {
# Other ostree artifacts image_build = { - '^Everything$': [ + '^AtomicHost$': [ { [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] 'image-build': { @@ -215,7 +215,7 @@ image_build = { }
ostree_installer = [ - ('^Atomic$', { + ('^AtomicHost$', { [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] '[[ arch ]]': { "repo": [
On 04/18/2018 11:48 AM, Dusty Mabe wrote:
This is an attempt to fix https://pagure.io/dusty/failed-composes/issue/176
I'd like to get patrick and one other person to review these changes.
Since it's not working now, and hard to get worse, +1.
We should be able to revert it if it causes problems for any other updates.
kevin
I agree with Kevin, but also it seems that patch should be working
So, +1
This is an attempt to fix https://pagure.io/dusty/failed-composes/issue/176
I'd like to get patrick and one other person to review these changes.
Sure, the changes look fine and easily revertable. Also, all these artifacts are failable. So +1.
On 04/19/2018 03:11 PM, Patrick マルタインアンドレアス Uiterwijk wrote:
This is an attempt to fix https://pagure.io/dusty/failed-composes/issue/176
I'd like to get patrick and one other person to review these changes.
Sure, the changes look fine and easily revertable. Also, all these artifacts are failable. So +1.
Deployed and hit an issue. small fixup patch that was just applied and approved by patrick/kevin in IRC:
``` $ git diff --ignore-all-space diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index b7c4bd529..ea4fe8476 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -195,8 +195,8 @@ volume_id_substitutions = { # Other ostree artifacts image_build = { '^AtomicHost$': [ - { [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] + { 'image-build': { 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')], 'name': 'Fedora-Atomic', @@ -208,9 +208,9 @@ image_build = { 'install_tree_from': "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" 'subvariant': 'AtomicHost', 'failable': ['*'], + } }, [% endfor %] - } ] } ```
infrastructure@lists.fedoraproject.org
-
Dusty Mabe -
Kevin Fenzi -
Mohan Boddu -
Patrick マルタインアンドレアス Uiterwijk