rel-eng/build-missing-builds-in-brew.sh | 31 +------------------------------
rel-eng/build-missing-builds-in-koji.sh | 29 ++++++++++++++++++++---------
2 files changed, 21 insertions(+), 39 deletions(-)
New commits:
commit 7ea94b81a5e1599633f5a6d5bc9248e1ac3d99c0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 24 13:38:12 2010 +0200
tito build --cvs-release expects 'yes' on stdin
diff --git a/rel-eng/build-missing-builds-in-koji.sh
b/rel-eng/build-missing-builds-in-koji.sh
index c95767f..d149350 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -29,7 +29,8 @@ done | sort | uniq | \
while read package ; do
(
echo Building package in path $package
- cd $package && ${TITO_PATH}tito build $TITO_BUILD_ARG | \
+ 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
commit 4803f467de1b4d37e12e42ca7962281c668a5d54
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 24 13:36:02 2010 +0200
merged build-missing-builds-in-{brew,koji}.sh together
diff --git a/rel-eng/build-missing-builds-in-brew.sh
b/rel-eng/build-missing-builds-in-brew.sh
deleted file mode 100755
index 4d71c38..215e460
--- a/rel-eng/build-missing-builds-in-brew.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# TAGS=([0]="satellite-5.4-rhel-5-candidate"
[1]="satellite-5.4-rhel-6-candidate")
-TAGS=([0]="satellite-5.4-rhel-5-candidate")
-
-pushd `pwd`
-
-cd `dirname $0`/..
-
-# say python to be nice to pipe
-export PYTHONUNBUFFERED=1
-
-for tag in 0 ; do
- rel-eng/koji-missing-builds.py --brew --no-extra ${TAGS[$tag]} | \
- awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/ ||
/heirloom-pkgtools/) {
- if (x==1) { print gensub(" *([a-zA-Z_-]+)-.*",
"\\1", "g")}
- }
- /Builds missing in koji/ { x=1 }' | \
- xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring | \
- grep -v solaris
-done | sort | uniq | \
-while read package ; do
- (
- echo Building package in path $package
- cd $package && ${TITO_PATH}tito build --cvs-release | \
- awk '/Wrote:.*tar.gz/ {print $2}'
- )
-done
-
-popd
diff --git a/rel-eng/build-missing-builds-in-brew.sh
b/rel-eng/build-missing-builds-in-brew.sh
new file mode 120000
index 4d71c38..215e460
--- /dev/null
+++ b/rel-eng/build-missing-builds-in-brew.sh
@@ -0,0 +1 @@
+build-missing-builds-in-koji.sh
\ No newline at end of file
diff --git a/rel-eng/build-missing-builds-in-koji.sh
b/rel-eng/build-missing-builds-in-koji.sh
index b74e9c0..c95767f 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -1,16 +1,24 @@
#!/bin/bash
-TAGS=([0]="dist-5E-sw-1.2-candidate" [1]="dist-f12-sw-1.2-candidate"
[2]="dist-f13-sw-1.2-candidate")
-pushd `pwd`
+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.2-candidate dist-f12-sw-1.2-candidate
dist-f13-sw-1.2-candidate"
+ TITO_BUILD_ARG="--koji-release"
+ FEDORA_UPLOAD=1
+fi
-cd `dirname $0`/..
+pushd . >/dev/null
+pushd `dirname $0`/.. >/dev/null
# say python to be nice to pipe
export PYTHONUNBUFFERED=1
-for tag in 0 1 2; do
- rel-eng/koji-missing-builds.py --no-extra ${TAGS[$tag]} | \
+for tag in $TAGS; do
+ rel-eng/koji-missing-builds.py $KOJI_MISSING_BUILD_BREW_ARG --no-extra $tag | \
awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/ ||
/heirloom-pkgtools/) {
if (x==1) { print gensub(" *([a-zA-Z_-]+)-.*",
"\\1", "g")}
}
@@ -20,10 +28,12 @@ for tag in 0 1 2; do
done | sort | uniq | \
while read package ; do
(
- echo Building package in path $package
- cd $package && ${TITO_PATH}tito build --koji-release | \
- awk '/Wrote:.*tar.gz/ {print $2}' | \
- xargs -I packagepath scp packagepath fedorahosted.org:spacewalk
+ echo Building package in path $package
+ cd $package && ${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
)
done
Show replies by date