Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 13:34:22 -0400 (Mon, 05 Jul 2010)
New Revision: 12579
Modified:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
Log:
[JBWS-3049] Simplifying script
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05
16:42:51 UTC (rev 12578)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05
17:34:22 UTC (rev 12579)
@@ -28,6 +28,10 @@
#
. $HUDSON_DIR/jboss/bin/jbossws-qa.sh
+
+rm -rf $WORKSPACE/*.diff
+rm -rf $WORKSPACE/modified-as
+
rm -rf $CXF_AS_HOME
cp -r $JBOSS_INSTANCE $CXF_AS_HOME
JBOSS_HOME=$CXF_AS_HOME
@@ -52,12 +56,8 @@
setupEnv
redeployBinaryDistribution
-rm -rf $WORKSPACE/modified-as
JBOSS_HOME=$WORKSPACE/modified-as
-rm -rf result.txt
-touch result.txt
-
#------------------------------------- CXF stack checks
-------------------------------------
cp -r $METRO_AS_HOME $JBOSS_HOME
@@ -65,16 +65,14 @@
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" >
$WORKSPACE/cxf_vs_cxfOverMetro.diff
-cat $WORKSPACE/cxf_vs_cxfOverMetro.diff >> $WORKSPACE/result.txt
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverMetro.diff
rm -rf $JBOSS_HOME
cp -r $NATIVE_AS_HOME $JBOSS_HOME
STACK_DIR=$CXF_BIN_DIST_DIR
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" >
$WORKSPACE/cxf_vs_cxfOverNative.diff
-cat $WORKSPACE/cxf_vs_cxfOverNative.diff >> $WORKSPACE/result.txt
+diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar >
$WORKSPACE/cxf_vs_cxfOverNative.diff
rm -rf $JBOSS_HOME
@@ -85,16 +83,14 @@
STACK_ID=native
setupEnv
redeployBinaryDistribution
-diff -r $NATIVE_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" >
$WORKSPACE/native_vs_nativeOverMetro.diff
-cat $WORKSPACE/native_vs_nativeOverMetro.diff >> $WORKSPACE/result.txt
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverMetro.diff
rm -rf $JBOSS_HOME
cp -r $CXF_AS_HOME $JBOSS_HOME
STACK_DIR=$NATIVE_BIN_DIST_DIR
STACK_ID=native
setupEnv
redeployBinaryDistribution
-diff -r $NATIVE_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" >
$WORKSPACE/native_vs_nativeOverCxf.diff
-cat $WORKSPACE/native_vs_nativeOverCxf.diff >> $WORKSPACE/result.txt
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
rm -rf $JBOSS_HOME
@@ -106,28 +102,19 @@
setupEnv
redeployBinaryDistribution
diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverCxf.diff
-cat $WORKSPACE/metro_vs_metroOverCxf.diff >> $WORKSPACE/result.txt
rm -rf $JBOSS_HOME
cp -r $NATIVE_AS_HOME $JBOSS_HOME
STACK_DIR=$METRO_BIN_DIST_DIR
STACK_ID=metro
setupEnv
redeployBinaryDistribution
-diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverNative.diff
-cat $WORKSPACE/metro_vs_metroOverNative.diff >> $WORKSPACE/result.txt
+diff -r $METRO_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar >
$WORKSPACE/metro_vs_metroOverNative.diff
rm -rf $JBOSS_HOME
-
rm -rf $CXF_AS_HOME
rm -rf $NATIVE_AS_HOME
rm -rf $METRO_AS_HOME
-cd $WORKSPACE
-if [ -s $WORKSPACE/result.txt ]; then
- echo "Differences detected"
- exit 1
-fi
-
</command>
</hudson.tasks.Shell>
</builders>
Show replies by date