PR#685: Update ostree repo from atomic/repo/ to ostree/repo - pungi-fedora

pungi-fedora

#685 Update ostree repo from atomic/repo/ to ostree/repo

Merged 5 years ago by puiterwijk. Opened 5 years ago by sinnykumari.

sinnykumari/pungi-fedora master into master

Update ostree repo from atomic/repo/ to ostree/repo

Sinny Kumari • 5 years ago

685a0f3

fedora.conf

file modified

+14 -10

		`@@ -765,7 +765,7 @@`
		`"config_branch": "master",`
		`"repo": "Everything",`
		`"tag_ref": False,`
		`- "ostree_repo": "/mnt/koji/compose/atomic/repo/",`
		`+ "ostree_repo": "/mnt/koji/compose/ostree/repo/",`
		`"ostree_ref": "fedora/rawhide/${basearch}/atomic-host",`
		`"arches": ["aarch64", "ppc64le", "x86_64"],`
		`"failable": ['*'],`
		`@@ -778,7 +778,7 @@`
		`"config_branch": "master",`
		`"repo": "Everything",`
		`"tag_ref": False,`
		`- "ostree_repo": "/mnt/koji/compose/atomic/repo/",`
		`+ "ostree_repo": "/mnt/koji/compose/ostree/repo/",`
		`"ostree_ref": "fedora/rawhide/${basearch}/silverblue",`
		`"arches": ["x86_64"],`
		`"failable": ['*'],`
		`@@ -794,10 +794,11 @@`
		`"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/repo/",`
		`- "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",`
		`+ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`+ "ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora-atomic",`
		`"ostree_oskey=fedora-30-primary",`
		`+ "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/x86_64/atomic-host",`
		`"ostree_update_ref=fedora/rawhide/x86_64/atomic-host",`
		`],`
		`@@ -812,10 +813,11 @@`
		`"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/repo/",`
		`- "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",`
		`+ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`+ "ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora-atomic",`
		`"ostree_oskey=fedora-30-primary",`
		`+ "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/aarch64/atomic-host",`
		`"ostree_update_ref=fedora/rawhide/aarch64/atomic-host",`
		`],`
		`@@ -830,10 +832,11 @@`
		`"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/repo/",`
		`- "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",`
		`+ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`+ "ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora-atomic",`
		`"ostree_oskey=fedora-30-primary",`
		`+ "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/ppc64le/atomic-host",`
		`"ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",`
		`],`
		`@@ -850,10 +853,11 @@`
		`"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/repo/",`
		`- "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",`
		`+ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`+ "ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora-workstation",`
		`"ostree_oskey=fedora-30-primary",`
		`+ "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/x86_64/silverblue",`
		`"ostree_update_ref=fedora/rawhide/x86_64/silverblue",`
		`],`

nightly.sh

file modified

+6 -6

		`@@ -21,8 +21,8 @@`
		`RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"`
		`RSYNCALTTARGET="/pub/alt/development/$RELEASE"`
		`RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE"`
		`- ATOMICSRCREPO="/mnt/koji/compose/atomic/repo/"`
		`- ATOMICDESTREPO="/mnt/koji/atomic/repo/"`
		`+ OSTREESRCREPO="/mnt/koji/compose/ostree/repo/"`
		`+ OSTREEDESTREPO="/mnt/koji/ostree/repo/"`
		`OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`# uncomment and edit for resuming a failed compose`
		`#COMPOSE_ID="Fedora-23-20150530.n.0"`
		`@@ -189,12 +189,12 @@`

		`# sync over Atomic Host and Silverblue to the unified ostree repo`
		`for arch in x86_64 aarch64 ppc64le; do`
		`- ostree pull-local --repo=$ATOMICDESTREPO $ATOMICSRCREPO --depth=-1 "fedora/rawhide/${arch}/atomic-host"`
		`- ostree summary -u --repo=$ATOMICDESTREPO # update summary file`
		`+ ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/rawhide/${arch}/atomic-host"`
		`+ ostree summary -u --repo=$OSTREEDESTREPO # update summary file`
		`done`
		`for arch in x86_64; do`
		`- ostree pull-local --repo=$ATOMICDESTREPO $ATOMICSRCREPO --depth=-1 "fedora/rawhide/${arch}/silverblue"`
		`- ostree summary -u --repo=$ATOMICDESTREPO # update summary file`
		`+ ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/rawhide/${arch}/silverblue"`
		`+ ostree summary -u --repo=$OSTREEDESTREPO # update summary file`
		`done`

		`# Push rawhide base container image to fedora registry`