davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Also update ostree_update_repo and add metalink
Related - https://pagure.io/fedora-infrastructure/issue/7487

Signed-off-by: Sinny Kumari <sinny@redhat.com>
This commit is contained in:
Sinny Kumari 2019-02-04 17:57:30 +05:30
parent 73fad5f754
commit 685a0f3d3d
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fedora.conf
View File

@ -765,7 +765,7 @@ ostree = {
"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 @@ ostree = {
"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 @@ ostree_installer = [
"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 @@ ostree_installer = [
"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 @@ ostree_installer = [
"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 @@ ostree_installer = [
"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",
],

12
nightly.sh
View File

@ -21,8 +21,8 @@ RSYNCPREFIX="sudo -u ftpsync"
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 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWC
# 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