From 7163cc2572cf617cdea623338cff2df7f7c0a942 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 22 May 2017 17:16:21 -0400 Subject: [PATCH] atomic: update lorax passed vars Similar to what we did in b28af80 on the f25 branch. Let's update the lorax passed vars. This is to match what is expected for [1]. [1] https://pagure.io/fedora-lorax-templates/pull-request/18 Signed-off-by: Dusty Mabe --- fedora-atomic.conf | 5 +++-- fedora.conf | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fedora-atomic.conf b/fedora-atomic.conf index 2e23318..fc822a0 100644 --- a/fedora-atomic.conf +++ b/fedora-atomic.conf @@ -270,9 +270,10 @@ ostree_installer = [ "add_template": ["atomic-installer/lorax-configure-repo.tmpl", "atomic-installer/lorax-embed-repo.tmpl"], "add_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/26/", + "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", "ostree_osname=fedora-atomic", - "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host", + "ostree_install_ref=fedora/rawhide/x86_64/atomic-host", + "ostree_update_ref=fedora/rawhide/x86_64/atomic-host", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'f26', diff --git a/fedora.conf b/fedora.conf index 3c34c10..864f69d 100644 --- a/fedora.conf +++ b/fedora.conf @@ -759,7 +759,8 @@ ostree_installer = [ "add_template_var": [ "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", "ostree_osname=fedora-atomic", - "ostree_ref=fedora/rawhide/x86_64/atomic-host", + "ostree_install_ref=fedora/rawhide/x86_64/atomic-host", + "ostree_update_ref=fedora/rawhide/x86_64/atomic-host", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'master', @@ -775,7 +776,8 @@ ostree_installer = [ "add_template_var": [ "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", "ostree_osname=fedora-atomic", - "ostree_ref=fedora/rawhide/aarch64/atomic-host", + "ostree_install_ref=fedora/rawhide/aarch64/atomic-host", + "ostree_update_ref=fedora/rawhide/aarch64/atomic-host", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'master', @@ -791,7 +793,8 @@ ostree_installer = [ "add_template_var": [ "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", "ostree_osname=fedora-atomic", - "ostree_ref=fedora/rawhide/ppc64le/atomic-host", + "ostree_install_ref=fedora/rawhide/ppc64le/atomic-host", + "ostree_update_ref=fedora/rawhide/ppc64le/atomic-host", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'master',