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

fedora.conf: atomic: move to unified ostree repo structure

Browse Source 
We move to /compose/atomic/repo for the compose time repo and to
/atomic/repo for the production/user repo. See [1].

[1] https://lists.fedoraproject.org/archives/list/rel-eng@lists.fedoraproject.org/thread/KLN5L33BIR3ZEHC5RIG4NXGO7LT6HBXJ/

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
This commit is contained in:
Dusty Mabe 2018-03-05 13:35:30 -05:00
parent 29a984ac28
commit cf4bbe8124
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fedora.conf
View File

@ -736,7 +736,7 @@ ostree = [
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
'failable': ['*'],
},
"x86_64": {
@ -745,7 +745,7 @@ ostree = [
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
'failable': ['*'],
},
"ppc64le": {
@ -754,7 +754,7 @@ ostree = [
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
'failable': ['*'],
}
}),
@ -780,8 +780,8 @@ 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/rawhide/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-atomic",
"ostree_install_ref=fedora/rawhide/x86_64/atomic-host",
"ostree_update_ref=fedora/rawhide/x86_64/atomic-host",
@ -797,8 +797,8 @@ 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/rawhide/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-atomic",
"ostree_install_ref=fedora/rawhide/aarch64/atomic-host",
"ostree_update_ref=fedora/rawhide/aarch64/atomic-host",
@ -814,8 +814,8 @@ 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/rawhide/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-atomic",
"ostree_install_ref=fedora/rawhide/ppc64le/atomic-host",
"ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",
@ -833,8 +833,8 @@ 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/ostree/rawhide/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-workstation",
"ostree_install_ref=fedora/rawhide/x86_64/workstation",
"ostree_update_ref=fedora/rawhide/x86_64/workstation",

14
nightly.sh
View File

@ -21,9 +21,8 @@ RSYNCPREFIX="sudo -u ftpsync"
RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
RSYNCALTTARGET="/pub/alt/development/$RELEASE"
RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE"
ATOMICHOSTREPO="/mnt/koji/compose/atomic/$RELEASE/"
ATOMICWSREPO="/mnt/koji/compose/ostree/$RELEASE/"
ATOMICHOSTDEST="/mnt/koji/atomic/$RELEASE/"
ATOMICSRCREPO="/mnt/koji/compose/atomic/repo/"
ATOMICDESTREPO="/mnt/koji/atomic/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"
@ -175,7 +174,14 @@ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
$RSYNCPREFIX rsync -avhH --delete-after $ATOMICHOSTREPO $ATOMICHOSTDEST
# sync over atomic host/workstation 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"
done
for arch in x86_64; do
ostree pull-local --repo=$ATOMICDESTREPO $ATOMICSRCREPO --depth=-1 "fedora/rawhide/${arch}/workstation"
done
# Tell interested persons that the rsync is done.
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete