rel-eng/build-missing-builds-in-koji.sh | 44 ++++++++++++++++++-------------- rel-eng/releasers.conf | 25 ++++++++++++++++++ 2 files changed, 50 insertions(+), 19 deletions(-)
New commits: commit f78a2f5a672ee8023e59b0d7290782b03b128d10 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Dec 6 16:07:26 2011 +0100
change build-missing-builds-in-koji.sh for tito 0.4 and upload tar.gz files only once and build only to those tags which are only missing the build
diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh index 32870a4..0c1cac3 100755 --- a/rel-eng/build-missing-builds-in-koji.sh +++ b/rel-eng/build-missing-builds-in-koji.sh @@ -1,15 +1,8 @@ #!/bin/bash
-if [ "$(basename $0)" == "build-missing-builds-in-brew.sh" ] ; then - TAGS="satellite-5.4-rhel-5-candidate" - KOJI_MISSING_BUILD_BREW_ARG="--brew" - TITO_BUILD_ARG="--cvs-release" -else - TAGS="dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate" - TITO_BUILD_ARG="--release" - FEDORA_UPLOAD=1 -fi +TAGS="dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate" +FEDORA_UPLOAD=1
pushd . >/dev/null pushd `dirname $0`/.. >/dev/null @@ -17,21 +10,34 @@ pushd `dirname $0`/.. >/dev/null # say python to be nice to pipe export PYTHONUNBUFFERED=1
+declare -a PACKAGES + for tag in $TAGS; do rel-eng/koji-missing-builds.py $KOJI_MISSING_BUILD_BREW_ARG --no-extra $tag | \ perl -lne '/^\s+(.+)-.+-.+$/ and print $1' | \ - xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring -done | sort | uniq | \ -while read package ; do + xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring \ + | \ + while read package ; do ( - echo Building package in path $package + echo Building package in path $package for $tag cd $package && \ - echo y | ${TITO_PATH}tito build $TITO_BUILD_ARG | \ - awk '/Wrote:.*tar.gz/ {print $2}' | \ - if [ "0$FEDORA_UPLOAD" -eq 1 ] ; then - xargs -I packagepath scp packagepath fedorahosted.org:spacewalk - fi + ${TITO_PATH}tito release $tag && \ + PACKAGES[${#PACKAGES[@]}]=$package ) + done done +if [ "0$FEDORA_UPLOAD" -eq 1 ] ; then + for package in "${PACKAGES[@]}"; do + echo $package + done | sort | uniq |\ + while read package ; do + ( + echo Uploading tgz for path $package + cd $package && LC_ALL=C ${TITO_PATH}tito build --tgz | \ + awk '/Wrote:.*tar.gz/ {print $2}' | \ + xargs -I packagepath scp packagepath fedorahosted.org:spacewalk + ) + done +fi
-popd +popd >/dev/null diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf index a7f1601..5da56b9 100644 --- a/rel-eng/releasers.conf +++ b/rel-eng/releasers.conf @@ -2,3 +2,28 @@ releaser = tito.release.KojiGitReleaser autobuild_tags = dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-5E-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-5E-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-6E-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-6E-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-f14-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-f14-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-f15-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-f15-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-f16-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-f16-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git
spacewalk-commits@lists.fedorahosted.org