setup for F-25 branching
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson
parent
be2e013270
commit
2330bf3df3
18
fedora.conf
18
fedora.conf
@ -6,7 +6,7 @@ release_is_layered = False
|
||||
|
||||
# GENERAL SETTINGS
|
||||
bootable = True
|
||||
comps_file = 'comps-rawhide.xml' #{
|
||||
comps_file = 'comps-f25.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://pagure.io/fedora-comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
@ -556,7 +556,7 @@ ostree = [
|
||||
"treefile": "fedora-atomic-docker-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"source_repo_from": "Everything",
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/25/"
|
||||
}
|
||||
}),
|
||||
("^ostree$", {
|
||||
@ -564,7 +564,7 @@ ostree = [
|
||||
"treefile": "fedora-ostree-workstation.json ",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"source_repo_from": "Workstation",
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/rawhide/"
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/25/"
|
||||
}
|
||||
})
|
||||
]
|
||||
@ -579,13 +579,13 @@ ostree_installer = [
|
||||
"add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
|
||||
"add_template_var": [
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
|
||||
"ostree_ref=fedora-atomic/25/x86_64/docker-host",
|
||||
],
|
||||
"add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
|
||||
"add_arch_template_var": [
|
||||
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
|
||||
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/25/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
|
||||
"ostree_ref=fedora-atomic/25/x86_64/docker-host",
|
||||
]
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
@ -600,13 +600,13 @@ ostree_installer = [
|
||||
"add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
|
||||
"add_template_var": [
|
||||
"ostree_osname=fedora-atomic",
|
||||
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
|
||||
"ostree_ref=fedora-atomic/25/x86_64/docker-host",
|
||||
],
|
||||
"add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
|
||||
"add_arch_template_var": [
|
||||
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",
|
||||
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/25/",
|
||||
"ostree_osname=fedora-workstation",
|
||||
"ostree_ref=fedora/rawhide/x86_64/workstation",
|
||||
"ostree_ref=fedora/25/x86_64/workstation",
|
||||
]
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
|
||||
14
nightly.sh
14
nightly.sh
@ -4,20 +4,20 @@
|
||||
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"
|
||||
DIST="25"
|
||||
BRANCHED="25"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f25.xml"
|
||||
GIT_BRANCH="master"
|
||||
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/"
|
||||
@ -127,7 +127,7 @@ do
|
||||
elif [ "$koji" = "ppc" ]; then
|
||||
arches=ppc64,ppc64le
|
||||
elif [ "$koji" = "s390" ]; then
|
||||
arches=s390,s390x
|
||||
arches=s390x
|
||||
fi
|
||||
./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/SRPMS/\*/ >$DESTDIR/logs/excludearch-$koji.log
|
||||
done
|
||||
|
||||
36
release-candidate.sh
Executable file
36
release-candidate.sh
Executable file
@ -0,0 +1,36 @@
|
||||
#!/bin/sh
|
||||
|
||||
export LC_ALL=C
|
||||
|
||||
LABEL=$1
|
||||
CONFIG="fedora-alpha.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/24"
|
||||
#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-f24.xml"
|
||||
TMPDIR=`mktemp -d /tmp/f24.$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 "$@"
|
||||
105
twoweek-nightly.sh
Executable file
105
twoweek-nightly.sh
Executable file
@ -0,0 +1,105 @@
|
||||
#!/bin/sh
|
||||
|
||||
export LC_ALL=C
|
||||
|
||||
CONFIG="fedora-atomic.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/twoweek"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY="--nightly"
|
||||
SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
DIST="25"
|
||||
BRANCHED="25"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f25.xml"
|
||||
GIT_BRANCH="f25"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$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-/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
|
||||
# if it does not exist clone it
|
||||
if [ -d releng ]; then
|
||||
pushd releng
|
||||
git pull --rebase
|
||||
popd
|
||||
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_MODNAME="compose"
|
||||
FEDMSG_CERTPREFIX="releng"
|
||||
. ./releng/scripts/fedmsg-functions.sh
|
||||
|
||||
# Announce that we are starting...
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
||||
|
||||
|
||||
pushd $TMPDIR
|
||||
git clone https://git.fedorahosted.org/git/comps.git && {
|
||||
pushd 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"
|
||||
|
||||
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 "$@"
|
||||
if [ "$?" = "0" ]; then
|
||||
export mail=0
|
||||
fi
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
$RSYNCPREFIX mkdir -p $DESTDIR
|
||||
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} 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
|
||||
done
|
||||
|
||||
|
||||
# Tell interested persons that the rsync is done.
|
||||
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} 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
|
||||
|
||||
|
||||
@ -32,7 +32,6 @@
|
||||
<arch>aarch64</arch>
|
||||
<arch>ppc64</arch>
|
||||
<arch>ppc64le</arch>
|
||||
<arch>s390</arch>
|
||||
<arch>s390x</arch>
|
||||
</arches>
|
||||
</variant>
|
||||
@ -55,7 +54,6 @@
|
||||
<arch>aarch64</arch>
|
||||
<arch>ppc64</arch>
|
||||
<arch>ppc64le</arch>
|
||||
<arch>s390</arch>
|
||||
<arch>s390x</arch>
|
||||
</arches>
|
||||
<groups>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user