Compare commits
139 Commits
Author | SHA1 | Date |
---|---|---|
Kevin Fenzi | 39fa9d623a | |
Peter Robinson | ea5a89ad5b | |
Dusty Mabe | a3e7de6054 | |
Adam Williamson | cbafd26bf7 | |
Adam Williamson | 1183d5f86b | |
Adam Williamson | f3b02d7540 | |
Adam Williamson | ff232bac77 | |
Dusty Mabe | 42747e7a4b | |
Dusty Mabe | 336d1ce9c6 | |
Dusty Mabe | 332210d854 | |
Dusty Mabe | 49b2843d3e | |
Adam Williamson | 7b2477a5eb | |
Adam Williamson | 739921d234 | |
Mohan Boddu | 595c763c46 | |
Adam Williamson | 585deac61c | |
Adam Williamson | 704d4371c7 | |
Adam Williamson | 732aee957d | |
Jiri Vymazal | 38722f355d | |
Stephen Gallagher | f79340e62b | |
Petr Písař | 4f604db3b7 | |
Tomas Mlcoch | f8f6dd4cbb | |
Tomas Mlcoch | 55dd65e549 | |
Dusty Mabe | 32b6b44d70 | |
Mohan Boddu | 9770327ebc | |
Jun Aruga | 2eba1aa56e | |
Mohan Boddu | 66d72b722d | |
Mohan Boddu | 1132c533a7 | |
Karsten Hopp | dcf45278af | |
Petr Písař | 9eb1652d87 | |
Nils Philippsen | 92c712f4f8 | |
Karsten Hopp | c6b3cc335c | |
Petr Písař | c5e8abdaad | |
Stephen Gallagher | c89358ea88 | |
Petr Písař | 1bcbc2d3d3 | |
Mohan Boddu | 01eb2cb82f | |
Mohan Boddu | 01843abac9 | |
Tomas Orsava | 100ec49b13 | |
Petr Písař | 7aa96d9cc0 | |
Petr Písař | 596182c1aa | |
Petr Písař | fbbb77751c | |
Stephen Gallagher | cb5f6476e7 | |
Stephen Gallagher | eebeabaa08 | |
Stephen Gallagher | 24bd43912c | |
Stephen Gallagher | d23e772d27 | |
Rashmi Nargundkar | 3fb675976b | |
Mohan Boddu | e2db6f7a34 | |
Stephen Gallagher | f357c434fa | |
Rashmi Nargundkar | 25ea318e63 | |
Mohan Boddu | 0b18609ee8 | |
Mohan Boddu | 34fdc9e54b | |
Stephen Gallagher | 526a35eed7 | |
Rashmi Nargundkar | de303ea811 | |
Rashmi Nargundkar | 8f0d186704 | |
Stephen Gallagher | 5f0b2e475e | |
Stephen Gallagher | 54f9c003dd | |
Stephen Gallagher | 2e877a4ea3 | |
Petr Šabata | 697ed4fcb2 | |
Stephen Gallagher | 819d40f8fd | |
Petr Šabata | a7ccee8220 | |
Stephen Gallagher | 1a93811fa4 | |
Mohan Boddu | 5c106df462 | |
Kevin Fenzi | 709cef7340 | |
Stephen Gallagher | 1f45a897f1 | |
Mohan Boddu | c8f13c07c3 | |
Dusty Mabe | ce3cc188b7 | |
Patrick Uiterwijk | 56b6e1e9f7 | |
Mohan Boddu | 9686f28f9b | |
Stephen Gallagher | 43b535607d | |
Mohan Boddu | a62e70ae81 | |
Igor Gnatenko | de25655726 | |
Mohan Boddu | 31ebfdf5ae | |
Stephen Gallagher | 0048f2185e | |
langdon | 5ac24e12d8 | |
Mohan Boddu | 7802b6d889 | |
Mohan Boddu | c51d6a531b | |
langdon | 66e11d0a51 | |
Dusty Mabe | b58781da42 | |
Lubomír Sedlář | b9afdab3e2 | |
Dennis Gilmore | aa2831bb0f | |
Dennis Gilmore | 033e2cbc0f | |
Karsten Hopp | 7a0f9829b7 | |
Stephen Gallagher | 56e9ea0fb6 | |
Dusty Mabe | 62fd429af1 | |
Mohan Boddu | 0ecf4f4315 | |
Dusty Mabe | 4141a6cb17 | |
Tomas Mlcoch | 536e4c4849 | |
Tomas Mlcoch | 29bd28faf5 | |
Tomas Mlcoch | 052888d6b6 | |
Stephen Gallagher | 66f65f79f7 | |
Tomas Mlcoch | 4997dcd658 | |
langdon | bce608b1c2 | |
Tomas Mlcoch | 58a894d82a | |
Merlin Mathesius | b75ebcf42e | |
Dennis Gilmore | d58fe12fb4 | |
Dennis Gilmore | 9b687e91f0 | |
Dusty Mabe | b629f94762 | |
Dennis Gilmore | 5f5558be61 | |
Dennis Gilmore | 93294a00a1 | |
langdon | 47e5308324 | |
Rashmi Nargundkar | 0a47d68b82 | |
Lubomír Sedlář | a88a100f62 | |
Mohan Boddu | 1553dfd93b | |
Mohan Boddu | 0fc38fb23d | |
Mohan Boddu | f72c67785f | |
Mohan Boddu | 4bf4b1029d | |
Petr Šabata | 676e706343 | |
Mohan Boddu | 46d11530ee | |
Mohan Boddu | e5134b201c | |
Mohan Boddu | f4cdaa2f26 | |
Mohan Boddu | 8822e6e57f | |
Mohan Boddu | b31fcfd369 | |
Kevin Fenzi | 7945574a35 | |
Mohan Boddu | 1665fc7702 | |
Petr Šabata | 38b9477e59 | |
Lubomír Sedlář | ea1e7cebe6 | |
Lubomír Sedlář | 50f523f4e8 | |
Mohan Boddu | ca382d46eb | |
Lubomír Sedlář | 2bb47ab308 | |
Peter Robinson | 7794d24646 | |
Ralph Bean | a5f496e626 | |
Patrick "マルタインアンドレアス" Uiterwijk | e6f063d03c | |
Ralph Bean | 19c68a2181 | |
Adam Samalik | 3a49ff2967 | |
Mohan Boddu | 673aff07fc | |
Mohan Boddu | e16253be32 | |
Ralph Bean | 88d5464623 | |
Ralph Bean | 09d9b42102 | |
Ralph Bean | b3b9e18b86 | |
Mohan Boddu | e56827d6de | |
Mohan Boddu | 636c390f13 | |
Lubomír Sedlář | cc516b2a44 | |
Mohan Boddu | 323e56287a | |
Jan Kaluza | 29f804910e | |
Dan Horák | c2074f66d8 | |
Adam Miller | 9a50c682d8 | |
Dusty Mabe | 74e42c0866 | |
Dusty Mabe | b4631deb82 | |
Dusty Mabe | ae0aa1a73d | |
Mohan Boddu | 9efeadfcb1 |
|
@ -6,25 +6,22 @@ LABEL=$1
|
|||
# to the script are passed to pungi-koji directly.
|
||||
shift
|
||||
CONFIG="fedora-cloud.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/"
|
||||
TARGET_DIR="/mnt/koji/compose/cloud"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY=""
|
||||
SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
|
||||
SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=createrepo"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
DIST="26"
|
||||
BRANCHED="26"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f26.xml"
|
||||
GIT_BRANCH="f26"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Cloud"
|
||||
RELEASE="27"
|
||||
RELEASE_TITLE="27"
|
||||
COMPSFILE="comps-f27.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)
|
||||
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"
|
||||
# assume a releng dir is a git checkout of the releng repo
|
||||
|
@ -37,13 +34,12 @@ else
|
|||
git clone https://pagure.io/releng.git
|
||||
fi
|
||||
# Set up our fedmsg function, using the releng repo definition
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
||||
FEDMSG_MODNAME="compose"
|
||||
FEDMSG_CERTPREFIX="releng"
|
||||
. ./releng/scripts/fedmsg-functions.sh
|
||||
# Announce that we are starting, even though we don't know the compose_id yet..
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
|
@ -59,29 +55,37 @@ else
|
|||
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
||||
fi
|
||||
time $CMD "$@"
|
||||
if [ "$?" = "0" ]; then
|
||||
export mail=0
|
||||
if [ "$?" != "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
# Set this to use later for a few items include depcheck
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
# Public URL the compose will wind up at, we put it in fedmsgs
|
||||
LOCATION=$(echo $DESTDIR|sed -e 's,/mnt/koji,https://kojipkgs.fedoraproject.org,g')
|
||||
# Update fedmsg template
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
|
||||
|
||||
$RSYNCPREFIX mkdir -p $DESTDIR
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
|
||||
#send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
||||
#for dir in CloudImage metadata ;
|
||||
# do
|
||||
# $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
|
||||
# $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
|
||||
# done
|
||||
# Tell interested persons that the rsync is done.
|
||||
#send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
|
||||
#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
# Tell everyone by email about the compose
|
||||
SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#if [ "$mail" = "0" ]; then
|
||||
# for tomail in $TOMAIL ; do
|
||||
# cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
|
||||
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
# done
|
||||
#fi
|
||||
SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#for tomail in $TOMAIL ; do
|
||||
# cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
|
||||
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
#done
|
||||
|
||||
find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
|
||||
|
|
|
@ -5,25 +5,22 @@ LABEL=$1
|
|||
# to the script are passed to pungi-koji directly.
|
||||
shift
|
||||
CONFIG="fedora-docker.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/"
|
||||
TARGET_DIR="/mnt/koji/compose/container"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY=""
|
||||
SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
|
||||
SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=createrepo"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
DIST="26"
|
||||
BRANCHED="26"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f26.xml"
|
||||
GIT_BRANCH="f26"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Docker"
|
||||
RELEASE="27"
|
||||
RELEASE_TITLE="27"
|
||||
COMPSFILE="comps-f27.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-26/COMPOSE_ID)
|
||||
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"
|
||||
# assume a releng dir is a git checkout of teh releng repo
|
||||
|
@ -36,13 +33,12 @@ else
|
|||
git clone https://pagure.io/releng.git
|
||||
fi
|
||||
# Set up our fedmsg function, using the releng repo definition
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
||||
FEDMSG_MODNAME="compose"
|
||||
FEDMSG_CERTPREFIX="releng"
|
||||
. ./releng/scripts/fedmsg-functions.sh
|
||||
# Announce that we are starting...
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
|
@ -58,27 +54,36 @@ else
|
|||
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
||||
fi
|
||||
time $CMD "$@"
|
||||
if [ "$?" = "0" ]; then
|
||||
export mail=0
|
||||
if [ "$?" != "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-26/COMPOSE_ID)
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
# Set this to use later for a few items include depcheck
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
# Public URL the compose will wind up at, we put it in fedmsgs
|
||||
LOCATION=$(echo $DESTDIR|sed -e 's,/mnt/koji,https://kojipkgs.fedoraproject.org,g')
|
||||
# Update fedmsg template
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
|
||||
|
||||
$RSYNCPREFIX mkdir -p $DESTDIR
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
|
||||
#send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
||||
#for dir in Docker metadata ;
|
||||
# do
|
||||
# $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
|
||||
# $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
|
||||
# done
|
||||
# Tell interested persons that the rsync is done.
|
||||
#send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
|
||||
#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
|
||||
SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#if [ "$mail" = "0" ]; then
|
||||
# for tomail in $TOMAIL ; do
|
||||
# cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
|
||||
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
# done
|
||||
#fi
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#for tomail in $TOMAIL ; do
|
||||
# cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
|
||||
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
#done
|
||||
|
||||
find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Atomic'
|
||||
release_short = 'Fedora-Atomic'
|
||||
release_version = '26'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
# GENERAL SETTINGS
|
||||
bootable = True
|
||||
|
@ -16,17 +16,17 @@ lorax_options = [
|
|||
}
|
||||
})
|
||||
]
|
||||
comps_file = 'comps-f26.xml' #{
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
# 'file': 'comps-f23.xml',
|
||||
#}
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['64DAB85D'] # None = unsigned
|
||||
sigkeys = ['F5282EE4'] # None = unsigned
|
||||
# limit tree architectures
|
||||
# if undefined, all architectures from variants.xml will be included
|
||||
tree_arches = ['x86_64']
|
||||
tree_arches = ['aarch64', 'ppc64le', 'x86_64']
|
||||
# limit tree variants
|
||||
# if undefined, all variants from variants.xml will be included
|
||||
tree_variants = ['Atomic', 'Cloud', 'CloudImages']
|
||||
|
@ -35,15 +35,16 @@ hashed_directories = True
|
|||
runroot = True
|
||||
#runroot_channel = 'fedora_compose'
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f26-build'
|
||||
runroot_tag = 'f27-build'
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
pkgset_koji_tag = 'f26-atomic'
|
||||
pkgset_koji_tag = 'f27-atomic-host-installer'
|
||||
pkgset_koji_inherit = True
|
||||
filter_system_release_packages = False
|
||||
# GATHER
|
||||
gather_source = 'comps'
|
||||
gather_method = 'deps'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
|
@ -212,38 +213,37 @@ disc_types = {
|
|||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = '27'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f27'
|
||||
image_build = {
|
||||
'^CloudImages$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Atomic',
|
||||
'target': 'f26',
|
||||
'version': '26',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
|
||||
'kickstart': 'fedora-atomic.ks',
|
||||
'distro': 'Fedora-20',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 6,
|
||||
'arches': ['x86_64'],
|
||||
'arches': ['aarch64', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic'
|
||||
'subvariant': 'Atomic',
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
|
||||
'name': 'Fedora-Atomic-Vagrant',
|
||||
'target': 'f26',
|
||||
'version': '26',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
|
||||
'kickstart': 'fedora-atomic-vagrant.ks',
|
||||
'distro': 'Fedora-20',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic'
|
||||
'subvariant': 'Atomic',
|
||||
},
|
||||
'factory-parameters': {
|
||||
'vagrant_sync_directory': '/home/vagrant/sync',
|
||||
|
@ -255,21 +255,57 @@ ostree_installer = [
|
|||
("^Atomic$", {
|
||||
"x86_64": {
|
||||
"repo": [ "Cloud",
|
||||
"https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
|
||||
"https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/27/Everything/$arch/os/"],
|
||||
"release": None,
|
||||
"installpkgs": ["fedora-productimg-atomic"],
|
||||
"rootfs_size": "4",
|
||||
"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/atomic/27/",
|
||||
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/27/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_install_ref=fedora/rawhide/x86_64/atomic-host",
|
||||
"ostree_update_ref=fedora/rawhide/x86_64/atomic-host",
|
||||
"ostree_install_ref=fedora/27/x86_64/updates/atomic-host",
|
||||
"ostree_update_ref=fedora/27/x86_64/atomic-host",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'f26',
|
||||
'template_branch': 'f27',
|
||||
},
|
||||
"aarch64": {
|
||||
"repo": [ "Cloud",
|
||||
"https://kojipkgs.fedoraproject.org/pub/fedora-secondary/releases/27/Everything/$arch/os/"],
|
||||
"release": None,
|
||||
"installpkgs": ["fedora-productimg-atomic"],
|
||||
"rootfs_size": "4",
|
||||
"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/atomic/27/",
|
||||
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/27/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_install_ref=fedora/27/aarch64/updates/atomic-host",
|
||||
"ostree_update_ref=fedora/27/aarch64/atomic-host",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'f27',
|
||||
},
|
||||
"ppc64le": {
|
||||
"repo": [ "Cloud",
|
||||
"https://kojipkgs.fedoraproject.org/pub/fedora-secondary/releases/27/Everything/$arch/os/"],
|
||||
"release": None,
|
||||
"installpkgs": ["fedora-productimg-atomic"],
|
||||
"rootfs_size": "4",
|
||||
"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/atomic/27/",
|
||||
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/27/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_install_ref=fedora/27/ppc64le/updates/atomic-host",
|
||||
"ostree_update_ref=fedora/27/ppc64le/atomic-host",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'f27',
|
||||
}
|
||||
})
|
||||
]
|
||||
|
|
|
@ -0,0 +1,746 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora'
|
||||
release_short = 'Fedora'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
|
||||
# GENERAL SETTINGS
|
||||
bootable = True
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://pagure.io/fedora-comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
# 'file': 'comps-f23.xml',
|
||||
#}
|
||||
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['F5282EE4']
|
||||
|
||||
# limit tree architectures
|
||||
# if undefined, all architectures from variants.xml will be included
|
||||
tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 's390x', 'x86_64']
|
||||
|
||||
# limit tree variants
|
||||
# if undefined, all variants from variants.xml will be included
|
||||
#tree_variants = ['Server']
|
||||
|
||||
hashed_directories = True
|
||||
|
||||
# RUNROOT settings
|
||||
runroot = True
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f27-build'
|
||||
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
|
||||
# PKGSET - REPOS
|
||||
# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
|
||||
# pkgset_repos = {}
|
||||
|
||||
# PKGSET - KOJI
|
||||
pkgset_koji_tag = 'f27-compose'
|
||||
pkgset_koji_inherit = True
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
||||
# GATHER
|
||||
gather_source = 'comps'
|
||||
gather_method = 'deps'
|
||||
gather_backend = 'dnf'
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
|
||||
# This can only be enabled once DNF 2 is used due to
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1260986
|
||||
#repoclosure_backend = 'dnf'
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
# gather_lookaside_repos = []
|
||||
|
||||
# GATHER - JSON
|
||||
# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
|
||||
#gather_source_mapping = '/path/to/mapping.json'
|
||||
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_deltas = False
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
media_checksum_one_file = True
|
||||
media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s_%(label)s-%(arch)s'
|
||||
#jigdo
|
||||
create_jigdo = False
|
||||
|
||||
# BUILDINSTALL
|
||||
buildinstall_method = 'lorax'
|
||||
|
||||
# Enables macboot on x86_64 for all variants and disables upgrade image building
|
||||
# # everywhere.
|
||||
lorax_options = [
|
||||
('^.*$', {
|
||||
'x86_64': {
|
||||
'nomacboot': False
|
||||
},
|
||||
'*': {
|
||||
'noupgrade': True
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
#extra_packages = [
|
||||
# '/mnt/packages/foo*',
|
||||
#]
|
||||
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
|
||||
additional_packages = [
|
||||
('.*', {
|
||||
'*': [
|
||||
'kernel*',
|
||||
'dracut*',
|
||||
'autocorr-*',
|
||||
'eclipse-nls',
|
||||
'eclipse-nls-*',
|
||||
'hunspell-*',
|
||||
'hyphen-*',
|
||||
'kde-l10n-*',
|
||||
'libreoffice-langpack-*',
|
||||
'man-pages-*',
|
||||
'mythes-*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Everything$', {
|
||||
'*': [
|
||||
'*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Server$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
('^Workstation$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
('^Cloud$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
]
|
||||
|
||||
multilib = [
|
||||
('^Everything$', {
|
||||
'x86_64': ['devel', 'runtime'],
|
||||
})
|
||||
]
|
||||
|
||||
filter_packages = [
|
||||
('(Workstation|Server|Cloud)$', {
|
||||
'*': [
|
||||
'kernel*debug*',
|
||||
'kernel-kdump*',
|
||||
'kernel-tools*',
|
||||
'syslog-ng*',
|
||||
'astronomy-bookmarks',
|
||||
'generic*',
|
||||
'GConf2-dbus*',
|
||||
'bluez-gnome',
|
||||
'java-1.8.0-openjdk',
|
||||
'community-mysql*',
|
||||
'jruby*',
|
||||
'gimp-help-*',
|
||||
]
|
||||
}),
|
||||
]
|
||||
|
||||
|
||||
# format: {arch|*: [packages]}
|
||||
multilib_blacklist = {
|
||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||
'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
|
||||
'php-devel', 'java-1.6.0-openjdk-devel',
|
||||
'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
|
||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
# format: {arch|*: [packages]}
|
||||
multilib_whitelist = {
|
||||
'*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
|
||||
'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
|
||||
'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
|
||||
'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
|
||||
'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
|
||||
'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust'
|
||||
],
|
||||
}
|
||||
|
||||
createiso_skip = [
|
||||
('^Workstation$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
||||
('^Server$', {
|
||||
'src': True
|
||||
}),
|
||||
|
||||
('^Cloud$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
||||
('^Everything$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
||||
]
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
|
||||
#extra_files = [
|
||||
# ('^(Server|Workstation|Cloud)$', {
|
||||
# '*': [
|
||||
# {
|
||||
# 'scm': 'rpm',
|
||||
# 'repo': 'fedora-release-%(variant_id_lower)s',
|
||||
# 'branch': None,
|
||||
# 'file': [
|
||||
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
|
||||
# ],
|
||||
# 'target': '',
|
||||
# },
|
||||
# ],
|
||||
# }),
|
||||
#]
|
||||
|
||||
# Image name respecting Fedora's image naming policy
|
||||
image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s_%(label)s.iso'
|
||||
# # Use the same format for volume id
|
||||
image_volid_formats = [
|
||||
'%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
|
||||
]
|
||||
# No special handling for layered products, use same format as for regular images
|
||||
image_volid_layered_product_formats = []
|
||||
# Replace 'Cloud' with 'C' in volume id etc.
|
||||
volume_id_substitutions = {
|
||||
'Atomic': 'AH',
|
||||
'Rawhide': 'rawh',
|
||||
'Images': 'img',
|
||||
'MATE_Compiz': 'MATE',
|
||||
'Security': 'Sec',
|
||||
'Electronic_Lab': 'Elec',
|
||||
'Robotics': 'Robo',
|
||||
'Scientific_KDE': 'SciK',
|
||||
'Astronomy_KDE': 'AstK',
|
||||
'Design_suite': 'Dsgn',
|
||||
'Games': 'Game',
|
||||
'Jam_KDE': 'Jam',
|
||||
'WorkstationOstree': 'WS',
|
||||
'Workstation': 'WS',
|
||||
'Everything': 'E',
|
||||
'Server': 'S',
|
||||
'Cloud': 'C',
|
||||
'Alpha': 'A',
|
||||
'Beta': 'B',
|
||||
'TC': 'T',
|
||||
}
|
||||
|
||||
disc_types = {
|
||||
'boot': 'netinst',
|
||||
'live': 'Live',
|
||||
}
|
||||
|
||||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
|
||||
global_release = '1.5'
|
||||
global_version = '27_Beta'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f27'
|
||||
|
||||
image_build = {
|
||||
'^Docker$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Docker-Base',
|
||||
'kickstart': 'fedora-docker-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Docker_Base',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Container-Minimal-Base',
|
||||
'kickstart': 'fedora-docker-base-minimal.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Container_Minimal_Base',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
'^CloudImages$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Cloud-Base',
|
||||
'kickstart': 'fedora-cloud-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Cloud',
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Cloud_Base',
|
||||
'failable': ['aarch64', 'ppc64', 'ppc64le'],
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Cloud-Base-Vagrant',
|
||||
'kickstart': 'fedora-cloud-base-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'Cloud',
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Cloud_Base',
|
||||
'failable': ['*'],
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Atomic',
|
||||
'kickstart': 'fedora-atomic.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 6,
|
||||
'arches': ['aarch64', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Atomic-Vagrant',
|
||||
'kickstart': 'fedora-atomic-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'vagrant_sync_directory': '/home/vagrant/sync',
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Labs$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Python-Classroom-Vagrant',
|
||||
'kickstart': 'fedora-python-classroom-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64','i386'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Python_Classroom',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Spins': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Minimal',
|
||||
'kickstart': 'fedora-disk-minimal.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['aarch64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Minimal',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Workstation$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Workstation',
|
||||
'kickstart': 'fedora-disk-workstation.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 8,
|
||||
'arches': ['aarch64'],
|
||||
'repo': 'Workstation',
|
||||
'install_tree_from': 'Workstation',
|
||||
'subvariant': 'Workstation',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Server$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Server',
|
||||
'kickstart': 'fedora-disk-server.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 7,
|
||||
'arches': ['aarch64'],
|
||||
'repo': 'Server',
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Server',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
live_media = {
|
||||
'^Workstation$': [
|
||||
{
|
||||
'name': 'Fedora-Workstation-Live',
|
||||
'kickstart': 'fedora-live-workstation.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['i386'],
|
||||
'repo': 'Everything',
|
||||
'subvariant': 'Workstation'
|
||||
|
||||
}
|
||||
],
|
||||
'^Spins': [
|
||||
{
|
||||
'name': 'Fedora-KDE-Live',
|
||||
'kickstart': 'fedora-live-kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['i386'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'KDE'
|
||||
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Xfce-Live',
|
||||
'kickstart': 'fedora-live-xfce.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Xfce'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-SoaS-Live',
|
||||
'kickstart': 'fedora-live-soas.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'SoaS'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Cinnamon-Live',
|
||||
'kickstart': 'fedora-live-cinnamon.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Cinnamon'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXDE-Live',
|
||||
'kickstart': 'fedora-live-lxde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-MATE_Compiz-Live',
|
||||
'kickstart': 'fedora-live-mate_compiz.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Mate'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXQt-Live',
|
||||
'kickstart': 'fedora-live-lxqt.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXQt'
|
||||
}
|
||||
],
|
||||
'^Labs$': [
|
||||
{
|
||||
'name': 'Fedora-Astronomy_KDE-Live',
|
||||
'kickstart': 'fedora-live-astronomy_kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Astronomy_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Design_suite-Live',
|
||||
'kickstart': 'fedora-live-design_suite.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Design_suite'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Scientific_KDE-Live',
|
||||
'kickstart': 'fedora-live-scientific_kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Scientific_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Games-Live',
|
||||
'kickstart': 'fedora-live-games.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Games'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Security-Live',
|
||||
'kickstart': 'fedora-live-security.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Security'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Jam_KDE-Live',
|
||||
'kickstart': 'fedora-live-jam_kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Jam_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Robotics-Live',
|
||||
'kickstart': 'fedora-live-robotics.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Robotics'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Python-Classroom-Live',
|
||||
'kickstart': 'fedora-live-python-classroom.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Python_Classroom'
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
failable_deliverables = [
|
||||
('^Server$', {
|
||||
'*': ['buildinstall', 'iso'],
|
||||
}),
|
||||
('^.*$', {
|
||||
# Buildinstall is non blocking
|
||||
'src': ['buildinstall'],
|
||||
# Nothing on aarch64, i386, ppc64, ppc64le blocks the compose
|
||||
'aarch64': ['buildinstall', 'iso'],
|
||||
'i386': ['buildinstall', 'iso'],
|
||||
'ppc64': ['buildinstall', 'iso'],
|
||||
'ppc64le': ['buildinstall', 'iso'],
|
||||
's390x': ['buildinstall', 'iso'],
|
||||
})
|
||||
]
|
||||
|
||||
live_target = 'f27'
|
||||
live_images_no_rename = True
|
||||
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
||||
live_images = [
|
||||
('^Workstation$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-workstation.ks',
|
||||
'name': 'Fedora-Workstation-armhfp',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
('^Server$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-server.ks',
|
||||
'name': 'Fedora-Server-armhfp',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
('^Spins$', {
|
||||
'armhfp': [{
|
||||
'kickstart': 'fedora-arm-kde.ks',
|
||||
'name': 'Fedora-KDE-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'KDE',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-lxde.ks',
|
||||
'name': 'Fedora-LXDE-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'LXDE',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-mate.ks',
|
||||
'name': 'Fedora-Mate-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Mate',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-minimal.ks',
|
||||
'name': 'Fedora-Minimal-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Minimal',
|
||||
'failable': False,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-soas.ks',
|
||||
'name': 'Fedora-SoaS-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'SoaS',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-xfce.ks',
|
||||
'name': 'Fedora-Xfce-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Xfce',
|
||||
'failable': False,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-lxqt.ks',
|
||||
'name': 'Fedora-LXQt-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'LXQt',
|
||||
'failable': True,
|
||||
},]
|
||||
}),
|
||||
('^Labs$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-python-classroom.ks',
|
||||
'name': 'Fedora-Python-Classroom-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Python_Classroom',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
]
|
||||
|
||||
ostree = [
|
||||
("^ostree$", {
|
||||
"x86_64": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-ostree-workstation.json",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "f27",
|
||||
"repo": "Workstation",
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/27/",
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
ostree_installer = [
|
||||
("^WorkstationOstree$", {
|
||||
"x86_64": {
|
||||
"repo": "Everything",
|
||||
"release": None,
|
||||
"installpkgs": ["fedora-productimg-workstation"],
|
||||
"rootfs_size": "8",
|
||||
"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/27/",
|
||||
"ostree_update_repo=https://kojipkgs.fedoraproject.org/compose/ostree/27/",
|
||||
"ostree_osname=fedora-workstation",
|
||||
"ostree_install_ref=fedora/27/x86_64/workstation",
|
||||
"ostree_update_ref=fedora/27/x86_64/workstation",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'f27',
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
koji_profile = 'compose_koji'
|
|
@ -1,11 +1,11 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Cloud'
|
||||
release_short = 'Fedora-Cloud'
|
||||
release_version = '26'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
# GENERAL SETTINGS
|
||||
bootable = False
|
||||
comps_file = 'comps-f26.xml' #{
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
|
@ -24,15 +24,16 @@ hashed_directories = True
|
|||
runroot = True
|
||||
#runroot_channel = 'fedora_compose'
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f26-build'
|
||||
runroot_tag = 'f27-build'
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
pkgset_koji_tag = 'f26-updates'
|
||||
pkgset_koji_tag = 'f27-updates'
|
||||
pkgset_koji_inherit = True
|
||||
filter_system_release_packages = False
|
||||
# GATHER
|
||||
gather_source = 'comps'
|
||||
gather_method = 'deps'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
|
@ -206,19 +207,19 @@ image_build = {
|
|||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Cloud-Base',
|
||||
'target': 'f26',
|
||||
'version': '26',
|
||||
'target': 'f27',
|
||||
'version': '27',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27',
|
||||
'kickstart': 'fedora-cloud-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 4,
|
||||
'arches': ['x86_64'],
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
|
||||
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/27/$arch/',
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/',
|
||||
],
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/',
|
||||
'subvariant': 'Cloud_Base'
|
||||
}
|
||||
},
|
||||
|
@ -226,19 +227,19 @@ image_build = {
|
|||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
|
||||
'name': 'Fedora-Cloud-Base-Vagrant',
|
||||
'target': 'f26',
|
||||
'version': '26',
|
||||
'target': 'f27',
|
||||
'version': '27',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27',
|
||||
'kickstart': 'fedora-cloud-base-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/'
|
||||
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/27/$arch/',
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/'
|
||||
],
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/',
|
||||
'subvariant': 'Cloud_Base',
|
||||
}
|
||||
},
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Docker'
|
||||
release_short = 'Fedora-Docker'
|
||||
release_version = '26'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
# GENERAL SETTINGS
|
||||
bootable = False
|
||||
comps_file = 'comps-f26.xml' #{
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
# 'file': 'comps-f23.xml',
|
||||
#}
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
|
||||
sigkeys = ['F5282EE4']
|
||||
# limit tree architectures
|
||||
# if undefined, all architectures from variants.xml will be included
|
||||
tree_arches = ['x86_64', 'armhfp']
|
||||
tree_arches = ['aarch64', 'armhfp', 'ppc64le', 'x86_64']
|
||||
# limit tree variants
|
||||
# if undefined, all variants from variants.xml will be included
|
||||
tree_variants = ['Docker']
|
||||
|
@ -24,15 +24,16 @@ hashed_directories = True
|
|||
runroot = True
|
||||
#runroot_channel = 'fedora_compose'
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f26-build'
|
||||
runroot_tag = 'f27-build'
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
pkgset_koji_tag = 'f25-updates'
|
||||
pkgset_koji_tag = 'f27-updates'
|
||||
pkgset_koji_inherit = True
|
||||
filter_system_release_packages = False
|
||||
# GATHER
|
||||
gather_source = 'comps'
|
||||
gather_method = 'deps'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
|
@ -201,38 +202,58 @@ disc_types = {
|
|||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = '27'
|
||||
global_target = 'f27'
|
||||
|
||||
image_build = {
|
||||
'^Docker$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Docker-Base',
|
||||
'target': 'f26',
|
||||
'version': '26',
|
||||
'release': None,
|
||||
# correct SHA1 hash will be put into the URL below automatically
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
|
||||
'kickstart': 'fedora-docker-base.ks',
|
||||
'distro': 'Fedora-20',
|
||||
'disk_size': 3,
|
||||
'arches': ['x86_64', 'armhfp'],
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/27/latest-Fedora-27/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
|
||||
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f27-updates/compose/Everything/$arch/os/',
|
||||
'https://kojipkgs.fedoraproject.org/compose/27/latest-Fedora-27/compose/Everything/$arch/os/',
|
||||
],
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
|
||||
'subvariant': 'Docker_Base'
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_labels': {
|
||||
'Name': 'fedora',
|
||||
'License': u'MIT',
|
||||
'Vendor': 'Fedora Project',
|
||||
'Version': '27',
|
||||
},
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Container-Minimal-Base',
|
||||
'kickstart': 'fedora-docker-base-minimal.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/27/latest-Fedora-27/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f27-updates/compose/Everything/$arch/os/',
|
||||
'https://kojipkgs.fedoraproject.org/compose/27/latest-Fedora-27/compose/Everything/$arch/os/',
|
||||
],
|
||||
'subvariant': 'Container_Minimal_Base',
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
|
|
|
@ -0,0 +1,747 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora'
|
||||
release_short = 'Fedora'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
|
||||
# GENERAL SETTINGS
|
||||
bootable = True
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://pagure.io/fedora-comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
# 'file': 'comps-f23.xml',
|
||||
#}
|
||||
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['F5282EE4']
|
||||
|
||||
# limit tree architectures
|
||||
# if undefined, all architectures from variants.xml will be included
|
||||
tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 's390x', 'x86_64']
|
||||
|
||||
# limit tree variants
|
||||
# if undefined, all variants from variants.xml will be included
|
||||
#tree_variants = ['Server']
|
||||
|
||||
hashed_directories = True
|
||||
|
||||
# RUNROOT settings
|
||||
runroot = True
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f27-build'
|
||||
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
|
||||
# PKGSET - REPOS
|
||||
# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
|
||||
# pkgset_repos = {}
|
||||
|
||||
# PKGSET - KOJI
|
||||
pkgset_koji_tag = 'f27-compose'
|
||||
pkgset_koji_inherit = True
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
||||
# GATHER
|
||||
gather_source = 'comps'
|
||||
gather_method = 'deps'
|
||||
gather_backend = 'dnf'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
|
||||
# This can only be enabled once DNF 2 is used due to
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1260986
|
||||
#repoclosure_backend = 'dnf'
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
# gather_lookaside_repos = []
|
||||
|
||||
# GATHER - JSON
|
||||
# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
|
||||
#gather_source_mapping = '/path/to/mapping.json'
|
||||
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_deltas = False
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
media_checksum_one_file = True
|
||||
media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.6-%(arch)s'
|
||||
#jigdo
|
||||
create_jigdo = False
|
||||
|
||||
# BUILDINSTALL
|
||||
buildinstall_method = 'lorax'
|
||||
|
||||
# Enables macboot on x86_64 for all variants and disables upgrade image building
|
||||
# # everywhere.
|
||||
lorax_options = [
|
||||
('^.*$', {
|
||||
'x86_64': {
|
||||
'nomacboot': False
|
||||
},
|
||||
'*': {
|
||||
'noupgrade': True
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
#extra_packages = [
|
||||
# '/mnt/packages/foo*',
|
||||
#]
|
||||
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
|
||||
additional_packages = [
|
||||
('.*', {
|
||||
'*': [
|
||||
'kernel*',
|
||||
'dracut*',
|
||||
'autocorr-*',
|
||||
'eclipse-nls',
|
||||
'eclipse-nls-*',
|
||||
'hunspell-*',
|
||||
'hyphen-*',
|
||||
'kde-l10n-*',
|
||||
'libreoffice-langpack-*',
|
||||
'man-pages-*',
|
||||
'mythes-*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Everything$', {
|
||||
'*': [
|
||||
'*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Server$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
('^Workstation$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
('^Cloud$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
]
|
||||
|
||||
multilib = [
|
||||
('^Everything$', {
|
||||
'x86_64': ['devel', 'runtime'],
|
||||
})
|
||||
]
|
||||
|
||||
filter_packages = [
|
||||
('(Workstation|Server|Cloud)$', {
|
||||
'*': [
|
||||
'kernel*debug*',
|
||||
'kernel-kdump*',
|
||||
'kernel-tools*',
|
||||
'syslog-ng*',
|
||||
'astronomy-bookmarks',
|
||||
'generic*',
|
||||
'GConf2-dbus*',
|
||||
'bluez-gnome',
|
||||
'java-1.8.0-openjdk',
|
||||
'community-mysql*',
|
||||
'jruby*',
|
||||
'gimp-help-*',
|
||||
]
|
||||
}),
|
||||
]
|
||||
|
||||
|
||||
# format: {arch|*: [packages]}
|
||||
multilib_blacklist = {
|
||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||
'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
|
||||
'php-devel', 'java-1.6.0-openjdk-devel',
|
||||
'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
|
||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
# format: {arch|*: [packages]}
|
||||
multilib_whitelist = {
|
||||
'*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
|
||||
'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
|
||||
'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
|
||||
'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
|
||||
'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
|
||||
'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust'
|
||||
],
|
||||
}
|
||||
|
||||
createiso_skip = [
|
||||
('^Workstation$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
||||
('^Server$', {
|
||||
'src': True
|
||||
}),
|
||||
|
||||
('^Cloud$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
||||
('^Everything$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
||||
]
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
|
||||
#extra_files = [
|
||||
# ('^(Server|Workstation|Cloud)$', {
|
||||
# '*': [
|
||||
# {
|
||||
# 'scm': 'rpm',
|
||||
# 'repo': 'fedora-release-%(variant_id_lower)s',
|
||||
# 'branch': None,
|
||||
# 'file': [
|
||||
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
|
||||
# ],
|
||||
# 'target': '',
|
||||
# },
|
||||
# ],
|
||||
# }),
|
||||
#]
|
||||
|
||||
# Image name respecting Fedora's image naming policy
|
||||
image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.6.iso'
|
||||
# # Use the same format for volume id
|
||||
image_volid_formats = [
|
||||
'%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
|
||||
]
|
||||
# No special handling for layered products, use same format as for regular images
|
||||
image_volid_layered_product_formats = []
|
||||
# Replace 'Cloud' with 'C' in volume id etc.
|
||||
volume_id_substitutions = {
|
||||
'Atomic': 'AH',
|
||||
'Rawhide': 'rawh',
|
||||
'Images': 'img',
|
||||
'MATE_Compiz': 'MATE',
|
||||
'Security': 'Sec',
|
||||
'Electronic_Lab': 'Elec',
|
||||
'Robotics': 'Robo',
|
||||
'Scientific_KDE': 'SciK',
|
||||
'Astronomy_KDE': 'AstK',
|
||||
'Design_suite': 'Dsgn',
|
||||
'Games': 'Game',
|
||||
'Jam_KDE': 'Jam',
|
||||
'WorkstationOstree': 'WS',
|
||||
'Workstation': 'WS',
|
||||
'Everything': 'E',
|
||||
'Server': 'S',
|
||||
'Cloud': 'C',
|
||||
'Alpha': 'A',
|
||||
'Beta': 'B',
|
||||
'TC': 'T',
|
||||
}
|
||||
|
||||
disc_types = {
|
||||
'boot': 'netinst',
|
||||
'live': 'Live',
|
||||
}
|
||||
|
||||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
|
||||
global_release = '1.6'
|
||||
global_version = '27'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f27'
|
||||
|
||||
image_build = {
|
||||
'^Docker$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Docker-Base',
|
||||
'kickstart': 'fedora-docker-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Docker_Base',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Container-Minimal-Base',
|
||||
'kickstart': 'fedora-docker-base-minimal.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Container_Minimal_Base',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
'^CloudImages$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Cloud-Base',
|
||||
'kickstart': 'fedora-cloud-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Cloud',
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Cloud_Base',
|
||||
'failable': ['aarch64', 'ppc64', 'ppc64le'],
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Cloud-Base-Vagrant',
|
||||
'kickstart': 'fedora-cloud-base-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'Cloud',
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Cloud_Base',
|
||||
'failable': ['*'],
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Atomic',
|
||||
'kickstart': 'fedora-atomic.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 6,
|
||||
'arches': ['aarch64', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Atomic-Vagrant',
|
||||
'kickstart': 'fedora-atomic-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'vagrant_sync_directory': '/home/vagrant/sync',
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Labs$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Python-Classroom-Vagrant',
|
||||
'kickstart': 'fedora-python-classroom-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64','i386'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Python_Classroom',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Spins': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Minimal',
|
||||
'kickstart': 'fedora-disk-minimal.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['aarch64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Minimal',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Workstation$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Workstation',
|
||||
'kickstart': 'fedora-disk-workstation.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 8,
|
||||
'arches': ['aarch64'],
|
||||
'repo': 'Workstation',
|
||||
'install_tree_from': 'Workstation',
|
||||
'subvariant': 'Workstation',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Server$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Server',
|
||||
'kickstart': 'fedora-disk-server.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 7,
|
||||
'arches': ['aarch64'],
|
||||
'repo': 'Server',
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Server',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
live_media = {
|
||||
'^Workstation$': [
|
||||
{
|
||||
'name': 'Fedora-Workstation-Live',
|
||||
'kickstart': 'fedora-live-workstation.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['i386'],
|
||||
'repo': 'Everything',
|
||||
'subvariant': 'Workstation'
|
||||
|
||||
}
|
||||
],
|
||||
'^Spins': [
|
||||
{
|
||||
'name': 'Fedora-KDE-Live',
|
||||
'kickstart': 'fedora-live-kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['i386'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'KDE'
|
||||
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Xfce-Live',
|
||||
'kickstart': 'fedora-live-xfce.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Xfce'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-SoaS-Live',
|
||||
'kickstart': 'fedora-live-soas.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'SoaS'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Cinnamon-Live',
|
||||
'kickstart': 'fedora-live-cinnamon.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Cinnamon'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXDE-Live',
|
||||
'kickstart': 'fedora-live-lxde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-MATE_Compiz-Live',
|
||||
'kickstart': 'fedora-live-mate_compiz.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Mate'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXQt-Live',
|
||||
'kickstart': 'fedora-live-lxqt.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXQt'
|
||||
}
|
||||
],
|
||||
'^Labs$': [
|
||||
{
|
||||
'name': 'Fedora-Astronomy_KDE-Live',
|
||||
'kickstart': 'fedora-live-astronomy_kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Astronomy_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Design_suite-Live',
|
||||
'kickstart': 'fedora-live-design_suite.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Design_suite'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Scientific_KDE-Live',
|
||||
'kickstart': 'fedora-live-scientific_kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Scientific_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Games-Live',
|
||||
'kickstart': 'fedora-live-games.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Games'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Security-Live',
|
||||
'kickstart': 'fedora-live-security.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Security'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Jam_KDE-Live',
|
||||
'kickstart': 'fedora-live-jam_kde.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Jam_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Robotics-Live',
|
||||
'kickstart': 'fedora-live-robotics.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Robotics'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Python-Classroom-Live',
|
||||
'kickstart': 'fedora-live-python-classroom.ks',
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Python_Classroom'
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
failable_deliverables = [
|
||||
('^Server$', {
|
||||
'*': ['buildinstall', 'iso'],
|
||||
}),
|
||||
('^.*$', {
|
||||
# Buildinstall is non blocking
|
||||
'src': ['buildinstall'],
|
||||
# Nothing on aarch64, i386, ppc64, ppc64le blocks the compose
|
||||
'aarch64': ['buildinstall', 'iso'],
|
||||
'i386': ['buildinstall', 'iso'],
|
||||
'ppc64': ['buildinstall', 'iso'],
|
||||
'ppc64le': ['buildinstall', 'iso'],
|
||||
's390x': ['buildinstall', 'iso'],
|
||||
})
|
||||
]
|
||||
|
||||
live_target = 'f27'
|
||||
live_images_no_rename = True
|
||||
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
||||
live_images = [
|
||||
('^Workstation$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-workstation.ks',
|
||||
'name': 'Fedora-Workstation-armhfp',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
('^Server$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-server.ks',
|
||||
'name': 'Fedora-Server-armhfp',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
('^Spins$', {
|
||||
'armhfp': [{
|
||||
'kickstart': 'fedora-arm-kde.ks',
|
||||
'name': 'Fedora-KDE-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'KDE',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-lxde.ks',
|
||||
'name': 'Fedora-LXDE-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'LXDE',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-mate.ks',
|
||||
'name': 'Fedora-Mate-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Mate',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-minimal.ks',
|
||||
'name': 'Fedora-Minimal-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Minimal',
|
||||
'failable': False,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-soas.ks',
|
||||
'name': 'Fedora-SoaS-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'SoaS',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-xfce.ks',
|
||||
'name': 'Fedora-Xfce-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Xfce',
|
||||
'failable': False,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-lxqt.ks',
|
||||
'name': 'Fedora-LXQt-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'LXQt',
|
||||
'failable': True,
|
||||
},]
|
||||
}),
|
||||
('^Labs$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-python-classroom.ks',
|
||||
'name': 'Fedora-Python-Classroom-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Python_Classroom',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
]
|
||||
|
||||
ostree = [
|
||||
("^ostree$", {
|
||||
"x86_64": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-ostree-workstation.json",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "f27",
|
||||
"repo": "Workstation",
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/27/",
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
ostree_installer = [
|
||||
("^WorkstationOstree$", {
|
||||
"x86_64": {
|
||||
"repo": "Everything",
|
||||
"release": None,
|
||||
"installpkgs": ["fedora-productimg-workstation"],
|
||||
"rootfs_size": "8",
|
||||
"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/27/",
|
||||
"ostree_update_repo=https://dl.fedoraproject.org/ostree/27/",
|
||||
"ostree_osname=fedora-workstation",
|
||||
"ostree_install_ref=fedora/27/x86_64/workstation",
|
||||
"ostree_update_ref=fedora/27/x86_64/workstation",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'f27',
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
koji_profile = 'compose_koji'
|
|
@ -0,0 +1,240 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Modular'
|
||||
release_short = 'Fedora-Modular'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
|
||||
# GENERAL SETTINGS
|
||||
bootable = True
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://pagure.io/fedora-comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
# 'file': 'comps-f23.xml',
|
||||
#}
|
||||
|
||||
variants_file='variants-modular.xml'
|
||||
sigkeys = ['a3cc4e62']
|
||||
|
||||
hashed_directories = True
|
||||
|
||||
# RUNROOT settings
|
||||
runroot = True
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'module-bootstrap-f27'
|
||||
|
||||
# PDC settings
|
||||
pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
|
||||
pdc_insecure = False
|
||||
pdc_develop = True
|
||||
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
|
||||
# PKGSET - KOJI
|
||||
# pkgset_koji_tag is not used by the modular compose, but Pungi needs this
|
||||
# option to appear in a config, otherwise it fails. Once this is fixed, we can
|
||||
# remove this option completely.
|
||||
pkgset_koji_tag = 'not-used'
|
||||
pkgset_koji_inherit = False
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
||||
# GATHER
|
||||
gather_source = 'module'
|
||||
gather_method = 'nodeps'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
# gather_lookaside_repos = []
|
||||
|
||||
# GATHER - JSON
|
||||
# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
|
||||
#gather_source_mapping = '/path/to/mapping.json'
|
||||
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_c = True
|
||||
createrepo_checksum = 'sha256'
|
||||
createrepo_deltas = False
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
media_checksum_one_file = True
|
||||
media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s_%(label)s-%(arch)s'
|
||||
#jigdo
|
||||
create_jigdo = False
|
||||
|
||||
# OK, we have the anaconda module now. Let's try buildinstall, but still skip
|
||||
# the phases which depend on it.
|
||||
skip_phases= ["live_media", "ostree"]
|
||||
|
||||
# BUILDINSTALL
|
||||
buildinstall_method = 'lorax'
|
||||
|
||||
# Enables macboot on x86_64 for all variants and disables upgrade image building
|
||||
# # everywhere.
|
||||
lorax_options = [
|
||||
('^.*$', {
|
||||
'x86_64': {
|
||||
'nomacboot': False
|
||||
},
|
||||
'*': {
|
||||
'noupgrade': True
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
|
||||
additional_packages = [
|
||||
|
||||
]
|
||||
|
||||
filter_packages = [
|
||||
# TODO - autogenerate this from the modulemd someday.
|
||||
]
|
||||
|
||||
createiso_skip = [
|
||||
('^base-runtime$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
('^Server$', {
|
||||
'*': False,
|
||||
'src': True
|
||||
}),
|
||||
]
|
||||
|
||||
# Image name respecting Fedora's image naming policy
|
||||
image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s_%(label)s.iso'
|
||||
# # Use the same format for volume id
|
||||
image_volid_formats = [
|
||||
'%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
|
||||
]
|
||||
# No special handling for layered products, use same format as for regular images
|
||||
image_volid_layered_product_formats = []
|
||||
# Replace 'Cloud' with 'C' in volume id etc.
|
||||
volume_id_substitutions = {
|
||||
'Atomic': 'AH',
|
||||
'Rawhide': 'rawh',
|
||||
'Images': 'img',
|
||||
'MATE_Compiz': 'MATE',
|
||||
'Security': 'Sec',
|
||||
'Electronic_Lab': 'Elec',
|
||||
'Robotics': 'Robo',
|
||||
'Scientific_KDE': 'SciK',
|
||||
'Astronomy_KDE': 'AstK',
|
||||
'Design_suite': 'Dsgn',
|
||||
'Games': 'Game',
|
||||
'Jam_KDE': 'Jam',
|
||||
'Workstation': 'WS',
|
||||
'Everything': 'E',
|
||||
'Server': 'S',
|
||||
'Cloud': 'C',
|
||||
'Alpha': 'A',
|
||||
'Beta': 'B',
|
||||
'TC': 'T',
|
||||
'Modular': 'M',
|
||||
'Bikeshed': 'BS',
|
||||
}
|
||||
|
||||
disc_types = {
|
||||
'boot': 'netinst',
|
||||
'live': 'Live',
|
||||
}
|
||||
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
|
||||
global_release = '1.5'
|
||||
global_version = '27_Modular_Beta'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'module-bootstrap-f27'
|
||||
|
||||
image_build = {
|
||||
'^Server$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Modular-Container-Base',
|
||||
'kickstart': 'fedora-modular-container-base.ks',
|
||||
'distro': 'Fedora-27',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Container_Base',
|
||||
'failable': ['aarch64', 'ppc64le'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': '1.10.1',
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container_modular", "FGC=f27-modular" ]',
|
||||
'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27-modular"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Modular-Container-Minimal',
|
||||
'kickstart': 'fedora-modular-container-base-minimal.ks',
|
||||
'distro': 'Fedora-27',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Container_Minimal',
|
||||
'failable': ['aarch64', 'ppc64le'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': '1.10.1',
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container_modular", "FGC=f27-modular" ]',
|
||||
'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27-modular"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Modular-Server',
|
||||
'kickstart': 'fedora-modular-disk-minimal.ks',
|
||||
'distro': 'Fedora-27',
|
||||
'disk_size': 8,
|
||||
'arches': ['aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Server',
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Server',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
failable_deliverables = [
|
||||
('^.*$', {
|
||||
# Buildinstall can fail on any variant and any arch
|
||||
'*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
|
||||
'src': ['buildinstall'],
|
||||
# Nothing on i386 blocks the compose
|
||||
'i386': ['buildinstall', 'iso', 'live'],
|
||||
})
|
||||
]
|
||||
|
||||
|
||||
live_images_no_rename = True
|
||||
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
||||
live_images = [
|
||||
('^Server$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-modular-arm-server.ks',
|
||||
'name': 'Fedora-Modular-Server-armhfp',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
]
|
||||
|
||||
|
||||
koji_profile = 'compose_koji'
|
|
@ -1,16 +1,19 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Modular'
|
||||
release_short = 'Fedora-Modular'
|
||||
release_version = 'Rawhide'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
|
||||
# GENERAL SETTINGS
|
||||
bootable = True
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://pagure.io/fedora-comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
# 'file': 'comps-f23.xml',
|
||||
#}
|
||||
|
||||
variants_file='variants-modular.xml'
|
||||
#sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
|
||||
# We are using unsigned here temporarily for rawhide until we setup
|
||||
# auto-signing.
|
||||
sigkeys = ['a3cc4e62']
|
||||
|
||||
hashed_directories = True
|
||||
|
@ -18,7 +21,7 @@ hashed_directories = True
|
|||
# RUNROOT settings
|
||||
runroot = True
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'module-bootstrap-rawhide'
|
||||
runroot_tag = 'module-bootstrap-f27'
|
||||
|
||||
# PDC settings
|
||||
pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
|
||||
|
@ -40,6 +43,7 @@ filter_system_release_packages = False
|
|||
# GATHER
|
||||
gather_source = 'module'
|
||||
gather_method = 'nodeps'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
|
||||
|
@ -65,7 +69,7 @@ create_jigdo = False
|
|||
|
||||
# OK, we have the anaconda module now. Let's try buildinstall, but still skip
|
||||
# the phases which depend on it.
|
||||
skip_phases= ["live_media", "live_images", "ostree"]
|
||||
skip_phases= ["live_media", "ostree"]
|
||||
|
||||
# BUILDINSTALL
|
||||
buildinstall_method = 'lorax'
|
||||
|
@ -98,7 +102,7 @@ createiso_skip = [
|
|||
'src': True
|
||||
}),
|
||||
('^Server$', {
|
||||
'*': True,
|
||||
'*': False,
|
||||
'src': True
|
||||
}),
|
||||
]
|
||||
|
@ -132,6 +136,8 @@ volume_id_substitutions = {
|
|||
'Alpha': 'A',
|
||||
'Beta': 'B',
|
||||
'TC': 'T',
|
||||
'Modular': 'M',
|
||||
'Bikeshed': 'BS',
|
||||
}
|
||||
|
||||
disc_types = {
|
||||
|
@ -139,25 +145,44 @@ disc_types = {
|
|||
'live': 'Live',
|
||||
}
|
||||
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = 'Rawhide'
|
||||
global_version = '27_Modular'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'module-bootstrap-rawhide'
|
||||
global_target = 'module-bootstrap-f27'
|
||||
|
||||
image_build = {
|
||||
'^Server$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Modular-Docker-Base',
|
||||
# https://pagure.io/fedora-kickstarts/pull-request/257
|
||||
'kickstart': 'fedora-modular-docker-base-minimal.ks',
|
||||
'name': 'Fedora-Modular-Container-Base',
|
||||
'kickstart': 'fedora-modular-container-base.ks',
|
||||
'distro': 'Fedora-27',
|
||||
'disk_size': 4,
|
||||
'arches': ['x86_64'],
|
||||
'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Docker_Base',
|
||||
'subvariant': 'Container_Base',
|
||||
'failable': ['aarch64', 'ppc64le','armhfp'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': '1.10.1',
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container_modular", "FGC=f27-modular" ]',
|
||||
'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27-modular"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('docker', 'tar.xz')],
|
||||
'name': 'Fedora-Modular-Container-Minimal',
|
||||
'kickstart': 'fedora-modular-container-base-minimal.ks',
|
||||
'distro': 'Fedora-27',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Container_Minimal',
|
||||
'failable': ['aarch64', 'ppc64le','armhfp'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': '1.10.1',
|
||||
|
@ -173,7 +198,7 @@ image_build = {
|
|||
'kickstart': 'fedora-modular-disk-minimal.ks',
|
||||
'distro': 'Fedora-27',
|
||||
'disk_size': 8,
|
||||
'arches': ['x86_64'],
|
||||
'arches': ['aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Server',
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Server',
|
||||
|
@ -197,4 +222,19 @@ failable_deliverables = [
|
|||
})
|
||||
]
|
||||
|
||||
|
||||
live_images_no_rename = True
|
||||
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
||||
live_images = [
|
||||
('^Server$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-modular-arm-server.ks',
|
||||
'name': 'Fedora-Modular-Server-armhfp',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
]
|
||||
|
||||
|
||||
koji_profile = 'compose_koji'
|
||||
|
|
132
fedora.conf
132
fedora.conf
|
@ -1,12 +1,12 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora'
|
||||
release_short = 'Fedora'
|
||||
release_version = 'Rawhide'
|
||||
release_version = '27'
|
||||
release_is_layered = False
|
||||
|
||||
# GENERAL SETTINGS
|
||||
bootable = True
|
||||
comps_file = 'comps-rawhide.xml' #{
|
||||
comps_file = 'comps-f27.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://pagure.io/fedora-comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
|
@ -48,6 +48,7 @@ filter_system_release_packages = False
|
|||
gather_source = 'comps'
|
||||
gather_method = 'deps'
|
||||
gather_backend = 'dnf'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
|
||||
|
@ -64,7 +65,7 @@ greedy_method = 'build'
|
|||
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_deltas = True
|
||||
createrepo_deltas = False
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
|
@ -237,25 +238,26 @@ image_volid_formats = [
|
|||
image_volid_layered_product_formats = []
|
||||
# Replace 'Cloud' with 'C' in volume id etc.
|
||||
volume_id_substitutions = {
|
||||
'Atomic': 'AH',
|
||||
'Rawhide': 'rawh',
|
||||
'Images': 'img',
|
||||
'MATE_Compiz': 'MATE',
|
||||
'Security': 'Sec',
|
||||
'Electronic_Lab': 'Elec',
|
||||
'Robotics': 'Robo',
|
||||
'Scientific_KDE': 'SciK',
|
||||
'Astronomy_KDE': 'AstK',
|
||||
'Design_suite': 'Dsgn',
|
||||
'Games': 'Game',
|
||||
'Jam_KDE': 'Jam',
|
||||
'Workstation': 'WS',
|
||||
'Everything': 'E',
|
||||
'Server': 'S',
|
||||
'Cloud': 'C',
|
||||
'Alpha': 'A',
|
||||
'Beta': 'B',
|
||||
'TC': 'T',
|
||||
'Atomic': 'AH',
|
||||
'Rawhide': 'rawh',
|
||||
'Images': 'img',
|
||||
'MATE_Compiz': 'MATE',
|
||||
'Security': 'Sec',
|
||||
'Electronic_Lab': 'Elec',
|
||||
'Robotics': 'Robo',
|
||||
'Scientific_KDE': 'SciK',
|
||||
'Astronomy_KDE': 'AstK',
|
||||
'Design_suite': 'Dsgn',
|
||||
'Games': 'Game',
|
||||
'Jam_KDE': 'Jam',
|
||||
'WorkstationOstree': 'WS',
|
||||
'Workstation': 'WS',
|
||||
'Everything': 'E',
|
||||
'Server': 'S',
|
||||
'Cloud': 'C',
|
||||
'Alpha': 'A',
|
||||
'Beta': 'B',
|
||||
'TC': 'T',
|
||||
}
|
||||
|
||||
disc_types = {
|
||||
|
@ -268,9 +270,9 @@ translate_paths = [
|
|||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = 'Rawhide'
|
||||
global_version = '27'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f27'
|
||||
|
||||
|
@ -283,7 +285,7 @@ image_build = {
|
|||
'kickstart': 'fedora-docker-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64', 'ppc64le', 'x86_64'],
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Docker_Base',
|
||||
|
@ -293,12 +295,7 @@ image_build = {
|
|||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_labels': {
|
||||
'Name': 'fedora',
|
||||
'License': u'MIT',
|
||||
'Vendor': 'Fedora Project',
|
||||
'Version': '27',
|
||||
},
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
|
@ -308,7 +305,7 @@ image_build = {
|
|||
'kickstart': 'fedora-docker-base-minimal.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64', 'ppc64le', 'x86_64'],
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Container_Minimal_Base',
|
||||
|
@ -318,12 +315,7 @@ image_build = {
|
|||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
|
||||
'docker_labels': {
|
||||
'Name': 'fedora-minimal',
|
||||
'License': u'MIT',
|
||||
'Vendor': 'Fedora Project',
|
||||
'Version': '27',
|
||||
},
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
|
@ -610,6 +602,9 @@ live_media = {
|
|||
}
|
||||
|
||||
failable_deliverables = [
|
||||
('^Server$', {
|
||||
'*': ['buildinstall', 'iso'],
|
||||
}),
|
||||
('^.*$', {
|
||||
# Buildinstall is non blocking
|
||||
'src': ['buildinstall'],
|
||||
|
@ -715,30 +710,27 @@ live_images = [
|
|||
ostree = [
|
||||
("^Atomic$", {
|
||||
"aarch64": {
|
||||
"version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f27",
|
||||
"repo": "Everything",
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/27/",
|
||||
'failable': ['*'],
|
||||
},
|
||||
"x86_64": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f27",
|
||||
"repo": "Everything",
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/27/",
|
||||
'failable': ['*'],
|
||||
},
|
||||
"ppc64le": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f27",
|
||||
"repo": "Everything",
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/27/",
|
||||
'failable': ['*'],
|
||||
}
|
||||
}),
|
||||
|
@ -747,9 +739,9 @@ ostree = [
|
|||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-ostree-workstation.json",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f27",
|
||||
"repo": "Workstation",
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/rawhide/",
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/27/",
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
|
@ -765,14 +757,14 @@ 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/27/",
|
||||
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/27/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_install_ref=fedora/rawhide/x86_64/atomic-host",
|
||||
"ostree_update_ref=fedora/rawhide/x86_64/atomic-host",
|
||||
"ostree_install_ref=fedora/27/x86_64/atomic-host",
|
||||
"ostree_update_ref=fedora/27/x86_64/atomic-host",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f27',
|
||||
'failable': ['*'],
|
||||
},
|
||||
"aarch64": {
|
||||
|
@ -783,14 +775,14 @@ 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/27/",
|
||||
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/27/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_install_ref=fedora/rawhide/aarch64/atomic-host",
|
||||
"ostree_update_ref=fedora/rawhide/aarch64/atomic-host",
|
||||
"ostree_install_ref=fedora/27/aarch64/atomic-host",
|
||||
"ostree_update_ref=fedora/27/aarch64/atomic-host",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f27',
|
||||
'failable': ['*'],
|
||||
},
|
||||
"ppc64le": {
|
||||
|
@ -801,18 +793,18 @@ 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/27/",
|
||||
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/27/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_install_ref=fedora/rawhide/ppc64le/atomic-host",
|
||||
"ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",
|
||||
"ostree_install_ref=fedora/27/ppc64le/atomic-host",
|
||||
"ostree_update_ref=fedora/27/ppc64le/atomic-host",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f27',
|
||||
'failable': ['*'],
|
||||
}
|
||||
}),
|
||||
("^Workstation$", {
|
||||
("^WorkstationOstree$", {
|
||||
"x86_64": {
|
||||
"repo": "Everything",
|
||||
"release": None,
|
||||
|
@ -821,14 +813,14 @@ 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/ostree/27/",
|
||||
"ostree_update_repo=https://dl.fedoraproject.org/ostree/27/",
|
||||
"ostree_osname=fedora-workstation",
|
||||
"ostree_install_ref=fedora/rawhide/x86_64/workstation",
|
||||
"ostree_update_ref=fedora/rawhide/x86_64/workstation",
|
||||
"ostree_install_ref=fedora/27/x86_64/workstation",
|
||||
"ostree_update_ref=fedora/27/x86_64/workstation",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f27',
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,28 +1,25 @@
|
|||
#!/bin/sh
|
||||
|
||||
#set -x
|
||||
|
||||
export LC_ALL=C
|
||||
|
||||
CONFIG="fedora-modular.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/"
|
||||
TARGET_DIR="/mnt/koji/compose"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY="--nightly"
|
||||
SKIP_PHASES="--skip-phase=productimg"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
DIST="rawhide"
|
||||
BRANCHED="Modular-Rawhide"
|
||||
BRANCH="rawhide"
|
||||
GIT_BRANCH="master"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
SHORT="Fedora-Modular"
|
||||
RELEASE="27"
|
||||
RELEASE_TITLE="27"
|
||||
COMPSFILE="comps-f27.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Modular-Rawhide/COMPOSE_ID)
|
||||
RSYNCTARGET="/pub/fedora/linux/modular/development/$RELEASE"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
|
||||
# assume a releng dir is a git checkout of the releng repo
|
||||
# if it does not exist clone it
|
||||
|
@ -40,8 +37,17 @@ FEDMSG_CERTPREFIX="releng"
|
|||
. ./releng/scripts/fedmsg-functions.sh
|
||||
|
||||
# Announce that we are starting, even though we don't know the compose_id yet..
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
make "${COMPSFILE}"
|
||||
cp "${COMPSFILE}" $DEST/
|
||||
popd
|
||||
}
|
||||
popd
|
||||
|
||||
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
|
||||
|
||||
|
@ -52,14 +58,61 @@ else
|
|||
fi
|
||||
|
||||
time $CMD "$@"
|
||||
if [ "$?" != "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Modular-Rawhide/COMPOSE_ID)
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g')
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
|
||||
|
||||
# Set this to use later for a few items include depcheck
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
# Public URL the synced compose will wind up at, we put it in fedmsgs
|
||||
LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
|
||||
# Update fedmsg template
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
|
||||
|
||||
compose-changelog -p $DESTDIR/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $DESTDIR/
|
||||
# Figure out a version for broken deps e-mail that goes to package maintainers.
|
||||
# For Bikeshed it's just bikeshed, for branched versions we prepend F- to the number.
|
||||
if [ "$RELEASE" = "bikeshed" ]; then
|
||||
TREENAME="$RELEASE"
|
||||
else
|
||||
TREENAME="F-$RELEASE"
|
||||
fi
|
||||
/usr/share/mash/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Server/" >"$DESTDIR/logs/depcheck"
|
||||
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
||||
|
||||
# Sync the content to /pub/fedora
|
||||
if [ ! -d "$RSYNCTARGET" ]; then
|
||||
mkdir "$RSYNCTARGET"
|
||||
fi
|
||||
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
|
||||
"$DESTDIR" "$RSYNCTARGET/" \
|
||||
--variant Server \
|
||||
--exclude=repodata
|
||||
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
|
||||
"$DESTDIR" "$RSYNCTARGET/" \
|
||||
--variant Server \
|
||||
--delete-after
|
||||
$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
|
||||
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
|
||||
|
||||
# Tell interested persons that the rsync is done.
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
|
||||
# Tell everyone by email about the compose
|
||||
SUBJECT='Fedora Modular '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
for tomail in $TOMAIL ; do
|
||||
cat $DESTDIR/logs/*verbose | \
|
||||
mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
done
|
||||
|
||||
# Remove old composes older than 14 days
|
||||
find $TARGET_DIR/Fedora-Modular-Rawhide* -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
|
||||
find $TARGET_DIR/$SHORT-$RELEASE_TITLE* -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
|
||||
|
|
32
nightly.sh
32
nightly.sh
|
@ -4,25 +4,25 @@
|
|||
export LC_ALL=C
|
||||
|
||||
CONFIG="fedora.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/rawhide"
|
||||
TARGET_DIR="/mnt/koji/compose/branched"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY="--nightly"
|
||||
SKIP_PHASES="--skip-phase=productimg"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
DIST="rawhide"
|
||||
BRANCHED="rawhide"
|
||||
BRANCH="rawhide"
|
||||
COMPSFILE="comps-rawhide.xml"
|
||||
GIT_BRANCH="master"
|
||||
DIST="27"
|
||||
BRANCHED="27"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f27.xml"
|
||||
GIT_BRANCH="f27"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID)
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-27/COMPOSE_ID)
|
||||
# uncomment and edit for resuming a failed compose
|
||||
#COMPOSE_ID="Fedora-23-20150530.n.0"
|
||||
|
||||
|
@ -54,11 +54,11 @@ git clone https://pagure.io/fedora-comps.git && {
|
|||
}
|
||||
popd
|
||||
|
||||
./releng/scripts/block_retired.py
|
||||
#./releng/scripts/block_retired.py
|
||||
./releng/scripts/block_retired.py --namespace=docker
|
||||
./releng/scripts/block_retired.py --namespace=container
|
||||
|
||||
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
|
||||
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
|
||||
|
||||
if [ -z "$COMPOSE_ID" ]; then
|
||||
CMD="$CMD --target-dir=$TARGET_DIR"
|
||||
|
@ -71,7 +71,7 @@ if [ "$?" != "0" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID)
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-27/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
|
||||
|
@ -80,10 +80,10 @@ fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compos
|
|||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
|
||||
compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
|
||||
/usr/share/mash/spam-o-matic $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck
|
||||
/usr/share/mash/spam-o-matic --treename="F-$BRANCHED" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck"
|
||||
|
||||
[ -z "$ARCH" ] && {
|
||||
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
|
||||
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
|
||||
}
|
||||
|
||||
ostree prune --repo=$ATOMICREPO --keep-younger-than="14 days ago" --refs-only
|
||||
|
@ -125,13 +125,11 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$DIST/ --na
|
|||
if [ ! -d /pub/fedora-secondary/development/$DIST ]; then
|
||||
mkdir /pub/fedora-secondary/development/$DIST
|
||||
fi
|
||||
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le \
|
||||
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
|
||||
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$DIST/ \
|
||||
--exclude=s390x \
|
||||
--link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata
|
||||
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le \
|
||||
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
|
||||
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$DIST/ \
|
||||
--exclude=s390x \
|
||||
--link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after
|
||||
$RSYNCPREFIX rm /pub/fedora-secondary/development/$DIST/.composeinfo
|
||||
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora-secondary/development/$DIST/ --name "$NEWCOMPOSE_ID"
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
#!/bin/sh
|
||||
export LC_ALL=C
|
||||
LABEL=$1
|
||||
# Remove the label from arguments. It gets special treatment. Other arguments
|
||||
# to the script are passed to pungi-koji directly.
|
||||
shift
|
||||
CONFIG="fedora-modular-beta.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/27"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY=""
|
||||
SKIP_PHASES="--skip-phase=productimg"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
COMPSFILE="comps-f27.xml"
|
||||
TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
|
||||
# uncomment and edit for resuming a failed compose
|
||||
#COMPOSE_ID="Fedora-23-20150530.n.0"
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
make "${COMPSFILE}"
|
||||
cp "${COMPSFILE}" $DEST/
|
||||
popd
|
||||
}
|
||||
popd
|
||||
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
|
||||
if [ -z "$COMPOSE_ID" ]; then
|
||||
CMD="$CMD --target-dir=$TARGET_DIR"
|
||||
else
|
||||
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
||||
fi
|
||||
time $CMD "$@"
|
|
@ -5,13 +5,13 @@ LABEL=$1
|
|||
# to the script are passed to pungi-koji directly.
|
||||
shift
|
||||
CONFIG="fedora-final.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/26"
|
||||
TARGET_DIR="/mnt/koji/compose/27"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY=""
|
||||
SKIP_PHASES="--skip-phase=productimg"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
COMPSFILE="comps-f26.xml"
|
||||
COMPSFILE="comps-f27.xml"
|
||||
TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
|
||||
# uncomment and edit for resuming a failed compose
|
||||
#COMPOSE_ID="Fedora-23-20150530.n.0"
|
||||
|
@ -23,7 +23,7 @@ git clone https://pagure.io/fedora-comps.git && {
|
|||
popd
|
||||
}
|
||||
popd
|
||||
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
|
||||
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
|
||||
if [ -z "$COMPOSE_ID" ]; then
|
||||
CMD="$CMD --target-dir=$TARGET_DIR"
|
||||
else
|
||||
|
|
|
@ -11,19 +11,17 @@ NIGHTLY=""
|
|||
SKIP_PHASES="--skip-phase=productimg --skip-phase=extra_files"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
DIST="26"
|
||||
BRANCHED="26"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f26.xml"
|
||||
GIT_BRANCH="f26"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Atomic"
|
||||
RELEASE="27"
|
||||
RELEASE_TITLE="27"
|
||||
COMPSFILE="comps-f27.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Atomic-26/COMPOSE_ID)
|
||||
RSYNCTARGET="/pub/alt/atomic/testing/$SHORTCOMPOSE_ID"
|
||||
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"
|
||||
# assume a releng dir is a git checkout of teh releng repo
|
||||
|
@ -36,13 +34,12 @@ else
|
|||
git clone https://pagure.io/releng.git
|
||||
fi
|
||||
# Set up our fedmsg function, using the releng repo definition
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
||||
FEDMSG_MODNAME="compose"
|
||||
FEDMSG_CERTPREFIX="releng"
|
||||
. ./releng/scripts/fedmsg-functions.sh
|
||||
# Announce that we are starting...
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
|
@ -58,28 +55,34 @@ else
|
|||
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
||||
fi
|
||||
time $CMD "$@"
|
||||
if [ "$?" = "0" ]; then
|
||||
export mail=0
|
||||
if [ "$?" != "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Atomic-26/COMPOSE_ID)
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
# Public URL the synced compose will wind up at, we put it in fedmsgs
|
||||
LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
|
||||
# Update fedmsg template
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
|
||||
|
||||
$RSYNCPREFIX mkdir -p $DESTDIR
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
||||
for dir in Atomic CloudImages Docker metadata ;
|
||||
do
|
||||
$RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
|
||||
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/ --name $NEWCOMPOSE_ID
|
||||
$RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ;
|
||||
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
|
||||
done
|
||||
# Tell interested persons that the rsync is done.
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
|
||||
SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#if [ "$mail" = "0" ]; then
|
||||
# for tomail in $TOMAIL ; do
|
||||
# cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
|
||||
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
# done
|
||||
#fi
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#for tomail in $TOMAIL ; do
|
||||
# cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
|
||||
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
#done
|
||||
|
|
|
@ -133,6 +133,14 @@
|
|||
<package>fedora-productimg-workstation</package>
|
||||
</buildinstallpackages>
|
||||
</variant>
|
||||
<variant id="WorkstationOstree" name="Workstation Ostree" type="variant" is_empty="true">
|
||||
<arches>
|
||||
<arch>aarch64</arch>
|
||||
<arch>armhfp</arch>
|
||||
<arch>i386</arch>
|
||||
<arch>x86_64</arch>
|
||||
</arches>
|
||||
</variant>
|
||||
<variant name="Cloud" id="Cloud" type="variant">
|
||||
<arches>
|
||||
<arch>aarch64</arch>
|
||||
|
|
|
@ -11,10 +11,66 @@
|
|||
<arch>s390x</arch>
|
||||
<arch>x86_64</arch>
|
||||
</arches>
|
||||
<buildinstallpackages>
|
||||
<package>fedora-productimg-server</package>
|
||||
</buildinstallpackages>
|
||||
<modules>
|
||||
<module>platform-master</module>
|
||||
<module>host-master</module>
|
||||
<module>shim-master</module>
|
||||
<module>hardware-support-f27</module>
|
||||
<module>host-f27</module>
|
||||
<module>installer-f27</module>
|
||||
<module>perl-5.26</module>
|
||||
<module>platform-f27</module>
|
||||
|
||||
<module>cloud-init-f27</module>
|
||||
<!--cockpit included in platform -->
|
||||
<module>freeipa-4.6</module>
|
||||
<module>networking-base-f27</module>
|
||||
<module>postgresql-9.6</module>
|
||||
<module>udisks2-2</module>
|
||||
<module>389-ds-1.3</module>
|
||||
<module>X11-base-f27</module>
|
||||
<module>apache-commons-f27</module>
|
||||
<module>bind-9</module>
|
||||
<module>fonts-f27</module>
|
||||
<module>httpd-2.4</module>
|
||||
<module>java-8</module>
|
||||
<module>maven-f27</module>
|
||||
<module>pki-master</module>
|
||||
<module>python2-ecosystem-f27</module>
|
||||
<module>python2-2.7</module>
|
||||
<module>python3-ecosystem-f27</module>
|
||||
<module>python3-3.6</module>
|
||||
<module>resteasy-3.0</module>
|
||||
<module>samba-4.7</module>
|
||||
<module>sssd-1.16</module>
|
||||
<module>tomcat-8.0</module>
|
||||
|
||||
<module>autotools-f27</module>
|
||||
<module>cmake-3.9</module>
|
||||
<!-- not ready: <module>gtk2-master</module> -->
|
||||
<!-- not ready: <module>gtk3-master</module> -->
|
||||
<!-- not ready: <module>systemtap-master</module> -->
|
||||
<!-- not ready: <module>texlive-master</module> -->
|
||||
|
||||
<!-- not ready: <module>cassandra-master</module> -->
|
||||
<module>mariadb-10.2</module>
|
||||
<module>mongodb-3.4</module>
|
||||
<module>mysql-5.7</module>
|
||||
<module>ninja-master</module>
|
||||
<!-- not ready: <module>nginx-master</module> -->
|
||||
<!-- not ready: <module>nis-master</module> -->
|
||||
<module>nodejs-6</module>
|
||||
<module>nodejs-8</module>
|
||||
<!-- not ready: <module>passenger-master</module> -->
|
||||
<!-- not ready: <module>php-master</module> -->
|
||||
<!-- not ready: <module>redis-master</module> -->
|
||||
<module>rsyslog-master</module>
|
||||
<module>ruby-2.4</module>
|
||||
<module>system-tools-2017.0</module>
|
||||
<!-- not ready: <module>varnish-master</module> -->
|
||||
|
||||
<module>libtom-f27</module>
|
||||
<module>boost-1.64</module>
|
||||
</modules>
|
||||
</variant>
|
||||
</variants>
|
||||
|
|
Loading…
Reference in New Issue