[releng] fix up typo
by Dennis Gilmore
commit 20d8d7e3445d3da29727f83e10a1fa24524ff5e8
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Nov 12 18:54:15 2014 -0600
fix up typo
scripts/run-pungi | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 2ec0264..aa84d5b 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -34,7 +34,7 @@ pushd
pushd $ATOMIC
git reset --hard
git pull --rebase
- echo '[fedora-bleed}
+ echo '[fedora-bleed]
name=fedora-bleed
gpgcheck=1
enabled=1
9 years, 7 months
[releng] add the bleed repo to the atomic compose tree
by Dennis Gilmore
commit b399c0768bcb9b0d6f167c1fd53c0a6c11a09ffb
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Nov 12 18:41:47 2014 -0600
add the bleed repo to the atomic compose tree
scripts/run-pungi | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 3cdbc94..2ec0264 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -34,6 +34,11 @@ pushd
pushd $ATOMIC
git reset --hard
git pull --rebase
+ echo '[fedora-bleed}
+name=fedora-bleed
+gpgcheck=1
+enabled=1
+baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/$basearch/' > fedora-bleed.repo
sed -i -e 's|mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-21&ar...' fedora*repo
mock -r fedora-branched-compose-x86_64 --init || exit 1
mock -r fedora-branched-compose-x86_64 --install rpm-ostree || exit 1
9 years, 7 months
[releng] not send kfsflatten output to /dev/null wrap the urls for atomic with "" to match the kickstart
by Dennis Gilmore
commit 26fea317977335707d29d6c08abdc3d2a42a93b8
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Nov 11 18:49:11 2014 -0600
not send kfsflatten output to /dev/null
wrap the urls for atomic with "" to match the kickstart
scripts/build-cloud-images | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/build-cloud-images b/scripts/build-cloud-images
index bffbf27..1d12df1 100755
--- a/scripts/build-cloud-images
+++ b/scripts/build-cloud-images
@@ -35,7 +35,7 @@ do
declare -l lspin
lspin=$spin
kickstart=fedora-cloud-$lspin-$GITHASH.ks
- ksflatten -c fedora-cloud-$lspin.ks -o $kickstart >& /dev/null
+ ksflatten -c fedora-cloud-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
#koji image-build fedora-cloud-$spin $VERSION --distro Fedora-20 $TARGET --ksurl=git://git.fedorahosted.org/git/spin-kickstarts.git?#$GITHASH --kickstart=fedora-cloud-$lspin.ks $url x86_64 i386 --format=qcow2 --format=raw --release=$VERSION --scratch --repo=$url --nowait --disk-size=3
koji image-build Fedora-Cloud-$spin $BUILD --distro Fedora-20 $TARGET --kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 i386 --format=qcow2 --format=raw-xz --release=$RELEASE --scratch --repo=$url --nowait --disk-size=3
@@ -46,9 +46,9 @@ do
declare -l lspin
lspin=$spin
kickstart=fedora-cloud-$lspin-$GITHASH.ks
- ksflatten -c fedora-cloud-$lspin.ks -o $kickstart >& /dev/null
+ ksflatten -c fedora-cloud-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
- sed -i -e "s|--url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/|--ur..." $kickstart
+ sed -i -e "s|--url=\"http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/\"|--url=\"$atomicurl\"|g" $kickstart
#koji image-build fedora-cloud-$spin $VERSION --distro Fedora-20 $TARGET --ksurl=git://git.fedorahosted.org/git/spin-kickstarts.git?#$GITHASH --kickstart=fedora-cloud-$lspin.ks $url x86_64 i386 --format=qcow2 --format=raw --release=$VERSION --scratch --repo=$url --nowait --disk-size=3
koji image-build Fedora-Cloud-$spin $BUILD --distro Fedora-20 $TARGET --kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 --format=qcow2 --format=raw-xz --release=$RELEASE --scratch --repo=$url --nowait --disk-size=6
@@ -59,7 +59,7 @@ do
declare -l lspin
lspin=$spin
kickstart=fedora-docker-$lspin-$GITHASH.ks
- ksflatten -c fedora-docker-$lspin.ks -o $kickstart >& /dev/null
+ ksflatten -c fedora-docker-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
#koji image-build fedora-cloud-$spin $VERSION --distro Fedora-20 $TARGET --ksurl=git://git.fedorahosted.org/git/spin-kickstarts.git?#$GITHASH --kickstart=fedora-cloud-$lspin.ks $url x86_64 i386 --format=qcow2 --format=raw --release=$VERSION --scratch --repo=$url --nowait --disk-size=3
koji image-build Fedora-Docker-$spin $BUILD --distro Fedora-20 $TARGET --kickstart=fedora-docker-$lspin-$GITHASH.ks $url x86_64 --format=docker --release=$RELEASE --scratch --repo=$url --nowait --disk-size=3
9 years, 7 months
[releng] build-functions: Init OSTree repos with --mode=archive-z2
by Till Maas
commit 328f68b49e21b85ae23f3db782519d36f8543d67
Author: Colin Walters <walters(a)verbum.org>
Date: Wed Nov 12 17:59:18 2014 +0100
build-functions: Init OSTree repos with --mode=archive-z2
This is the mode intended for HTTP export.
scripts/build-functions.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 00d2bee..04c1a69 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -141,7 +141,7 @@ log "starting atomic tree creation"
MOCKCONFIG="fedora-${DIST}-compose-x86_64"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --init
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --install rpm-ostree git
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST ;fi"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST --mode=archive-z2;fi"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git log -n 1 --pretty='%h: %ci - %s' && git checkout ${GIT_BRANCH}"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/${DIST}/x...' fedora*repo"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
9 years, 7 months
[releng] build-functions: Log git revisions
by Till Maas
commit 288d14ab521a6365030c7a15783a855c24a22a4b
Author: Till Maas <opensource(a)till.name>
Date: Wed Nov 12 17:45:10 2014 +0100
build-functions: Log git revisions
scripts/build-functions.sh | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index a052913..00d2bee 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -3,6 +3,12 @@
# Sourced by buildbranched and buildrawhide
set -x
+function echogit() {
+ echo "Using GIT revision: $(git log -n 1 --pretty="%h: %ci - %s")"
+}
+
+echogit
+
[ -n "$ARCH" ] && {
TREEPREFIX="/mnt/koji/tree"
EXPANDARCH="-$ARCH"
@@ -73,6 +79,7 @@ log "git clone of comps started"
pushd $TMPDIR
git clone https://git.fedorahosted.org/git/comps.git && {
pushd comps
+ echogit
make "${COMPSFILE}"
cp "${COMPSFILE}" $logdir/
popd
@@ -135,7 +142,7 @@ MOCKCONFIG="fedora-${DIST}-compose-x86_64"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --init
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --install rpm-ostree git
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST ;fi"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git checkout ${GIT_BRANCH}"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git log -n 1 --pretty='%h: %ci - %s' && git checkout ${GIT_BRANCH}"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/${DIST}/x...' fedora*repo"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
log "finished atomic tree creation"
@@ -213,6 +220,7 @@ pushd ../
git clone https://git.fedorahosted.org/git/spin-kickstarts.git
pushd spin-kickstarts
git checkout "${GIT_BRANCH}"
+echogit
log "finished checking out spin-kickstarts"
log "started building live/arm/cloud images"
../releng/scripts/build-livecds $BRANCHED $DATE $BRANCHED
9 years, 7 months
[releng] Add set -x to build functions/scripts
by Till Maas
commit 2ff2cb408b765c3b5429b89abcf50d8c838d0b94
Author: Till Maas <opensource(a)till.name>
Date: Wed Nov 12 17:39:00 2014 +0100
Add set -x to build functions/scripts
scripts/build-functions.sh | 2 +-
scripts/buildbranched | 1 +
scripts/buildrawhide | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 208c932..a052913 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -1,7 +1,7 @@
# Copyright (C) 2012 Red Hat Inc.
# SPDX-License-Identifier: GPL-2.0+
# Sourced by buildbranched and buildrawhide
-
+set -x
[ -n "$ARCH" ] && {
TREEPREFIX="/mnt/koji/tree"
diff --git a/scripts/buildbranched b/scripts/buildbranched
index de3f4a6..c0a1020 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: GPL-2.0+
# runs currently on releng03.phx2.fedoraproject.org
+set -x
DATE=$1
ARCH=$2
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index ab19a54..e6c1137 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: GPL-2.0+
# runs currently on releng03.phx2.fedoraproject.org
+set -x
DATE=$1
ARCH=$2
9 years, 7 months
[releng] build-functions: Log also to stderr
by Till Maas
commit 46f3cf20a86dad0afa19d02df9c0e7a4e2ad631d
Author: Till Maas <opensource(a)till.name>
Date: Wed Nov 12 17:38:14 2014 +0100
build-functions: Log also to stderr
scripts/build-functions.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 0025c81..208c932 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -43,7 +43,7 @@ touch "${logfile}"
function log()
{
message="${1}"
- echo "$(date --utc) build${DIST}: ${message}" >> "${logfile}"
+ echo "$(date --utc) build${DIST}: ${message}" | tee -a "${logfile}" >&2
}
function send_fedmsg()
9 years, 7 months
[releng] Updated tag rawhide-stable
by Till Maas
The lightweight tag 'rawhide-stable' was updated to point to:
328f68b... build-functions: Init OSTree repos with --mode=archive-z2
It previously pointed to:
288d14a... build-functions: Log git revisions
NOTE: People pulling from the repository will not get the new tag.
For more information, please see:
http://live.gnome.org/Git/Help/TagUpdates
9 years, 7 months
[releng] Updated tag rawhide-stable
by Till Maas
The lightweight tag 'rawhide-stable' was updated to point to:
288d14a... build-functions: Log git revisions
It previously pointed to:
be7d01d... not send kfsflatten output to /dev/null wrap the urls for a
NOTE: People pulling from the repository will not get the new tag.
For more information, please see:
http://live.gnome.org/Git/Help/TagUpdates
9 years, 7 months