PR#255: Update ws-ostree variables for pending lorax templates unification - pungi-fedora

pungi-fedora

#255 Update ws-ostree variables for pending lorax templates unification

Merged 6 years ago by mohanboddu. Opened 6 years ago by walters.

walters/pungi-fedora ws-ostree-merge into master

FAH/WS-ostree: Use unified lorax templates

Colin Walters • 6 years ago

d310ecc

fedora-atomic.conf

file modified

+2 -2

		`@@ -267,8 +267,8 @@`
		`"release": None,`
		`"installpkgs": ["fedora-productimg-atomic"],`
		`"rootfs_size": "3",`
		`- "add_template": ["atomic-installer/lorax-configure-repo.tmpl",`
		`- "atomic-installer/lorax-embed-repo.tmpl"],`
		`+ "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`+ "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`"add_template_var": [`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",`
		`"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",`

fedora.conf

file modified

+12 -10

		`@@ -758,8 +758,8 @@`
		`"release": None,`
		`"installpkgs": ["fedora-productimg-atomic"],`
		`"rootfs_size": "3",`
		`- "add_template": ["atomic-installer/lorax-configure-repo.tmpl",`
		`- "atomic-installer/lorax-embed-repo.tmpl"],`
		`+ "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`+ "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`"add_template_var": [`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",`
		`"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",`
		`@@ -776,8 +776,8 @@`
		`"release": None,`
		`"installpkgs": ["fedora-productimg-atomic"],`
		`"rootfs_size": "3",`
		`- "add_template": ["atomic-installer/lorax-configure-repo.tmpl",`
		`- "atomic-installer/lorax-embed-repo.tmpl"],`
		`+ "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`+ "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`"add_template_var": [`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",`
		`"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",`
		`@@ -794,8 +794,8 @@`
		`"release": None,`
		`"installpkgs": ["fedora-productimg-atomic"],`
		`"rootfs_size": "3",`
		`- "add_template": ["atomic-installer/lorax-configure-repo.tmpl",`
		`- "atomic-installer/lorax-embed-repo.tmpl"],`
		`+ "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`+ "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`"add_template_var": [`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",`
		`"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",`
		`@@ -814,12 +814,14 @@`
		`"release": None,`
		`"installpkgs": ["fedora-productimg-workstation"],`
		`"rootfs_size": "8",`
		`- "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl",`
		`- "workstation-ostree-installer/lorax-embed-repo.tmpl"],`
		`+ "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`+ "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`"add_template_var": [`
		`- "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",`
		`+ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",`
		`+ "ostree_update_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",`
		`"ostree_osname=fedora-workstation",`
		`- "ostree_ref=fedora/rawhide/x86_64/workstation",`
		`+ "ostree_install_ref=fedora/rawhide/x86_64/workstation",`
		`+ "ostree_update_ref=fedora/rawhide/x86_64/workstation",`
		`],`
		`'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`'template_branch': 'master',`