rel-eng/build-missing-builds-in-brew.sh | 30 +++++++++++++++++++-----------
rel-eng/koji-missing-builds.py | 7 ++++++-
rel-eng/tito.props | 4 ++++
3 files changed, 29 insertions(+), 12 deletions(-)
New commits:
commit 3d15dc77b73597cb6cc1c6d442f66ef4a7aa40f8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 8 14:52:02 2010 +0200
Update the brew-checking script.
diff --git a/rel-eng/build-missing-builds-in-brew.sh
b/rel-eng/build-missing-builds-in-brew.sh
index 17aa904..4d71c38 100755
--- a/rel-eng/build-missing-builds-in-brew.sh
+++ b/rel-eng/build-missing-builds-in-brew.sh
@@ -1,22 +1,30 @@
#!/bin/bash
-TAG=satellite-5E-5.3-candidate
+# 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`/..
-rel-eng/brew-missing-builds.pl $TAG | \
- awk '!/buildsys-macros/ {
+# 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 brew/ { x=1 }' | \
- xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring | \
- while read package ; do
- (
- cd $package && make srpm DIST='.el5' | \
- awk '/Wrote:/ {print $2}' | \
- xargs -I packagepath brew build $TAG packagepath
- )
+ /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/koji-missing-builds.py b/rel-eng/koji-missing-builds.py
index f2e582d..e8036ef 100755
--- a/rel-eng/koji-missing-builds.py
+++ b/rel-eng/koji-missing-builds.py
@@ -42,7 +42,12 @@ distmap = {'6E':'.el6',
distsuffix = ''
tag = args[0]
-disttag = distmap[tag.split('-')[1]]
+if tag == 'satellite-5.4-rhel-5-candidate':
+ disttag = '.el5'
+elif tag == 'satellite-5.4-rhel-6-candidate':
+ disttag = '.el6'
+else:
+ disttag = distmap[tag.split('-')[1]]
pkgstoignore = []
if config.has_section(tag) and config.has_option(tag, 'blacklist'):
pkgstoignore = config.get(tag, 'blacklist').split(' ')
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index d9b5da9..ff36e48 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -15,3 +15,7 @@ blacklist=jabberd-selinux
[dist-f13-sw-1.1-candidate]
disttag = .fc13
blacklist=jabberd-selinux
+
+[cvs]
+cvsroot = :gserver:cvs.devel.redhat.com:/cvs/dist
+branches = SATELLITE-5_4-RHEL-5 SATELLITE-5_4-RHEL-6
Show replies by date