Bug 546105 - Collect build logs for CJE environment

Change-Id: I166313112299e7573ef2e854ef9f57381602c520
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

10 files changed, 15 insertions, 11 deletions

diff --git a/cje-production/master-build.sh b/cje-production/master-build.sh
index ca3e70c91..da2827b39 100755
--- a/cje-production/master-build.sh
+++ b/cje-production/master-build.sh
@@ -28,7 +28,9 @@ do
 done
 popd
 
+wait
+
 source $CJE_ROOT/buildproperties.shsource 
 
-mv -r $logDir $CJE_ROOT/$DROP_DIR/$BUILD_ID
+mv -f $logDir $CJE_ROOT/$DROP_DIR/$BUILD_ID
 mv $CJE_ROOT/buildproperties.* $CJE_ROOT/$DROP_DIR/$BUILD_ID
diff --git a/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh
index 3a6320acb..357bdc517 100755
--- a/cje-production/mbscripts/mb010_createEnvfiles.sh
+++ b/cje-production/mbscripts/mb010_createEnvfiles.sh
@@ -65,4 +65,4 @@ do
 done < ../buildproperties.txt
 
 source $BUILD_ENV_FILE
-fn-addToPropFiles BUILD_ID "\"$BUILD_TYPE$TIMESTAMP\""
\ No newline at end of file
+fn-addToPropFiles BUILD_ID "\"$BUILD_TYPE$TIMESTAMP\""
diff --git a/cje-production/mbscripts/mb020_createBaseBuilder.sh b/cje-production/mbscripts/mb020_createBaseBuilder.sh
index f9210d311..01612af3b 100755
--- a/cje-production/mbscripts/mb020_createBaseBuilder.sh
+++ b/cje-production/mbscripts/mb020_createBaseBuilder.sh
@@ -40,4 +40,4 @@ ${TMP}/eclipse/eclipse -nosplash \
       -destination \
       ${qualifiedBaseBuilder} \
       -profile \
-      SDKProfile
+      SDKProfile &
diff --git a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
index 3dbb8a5c9..fad2ec3eb 100755
--- a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
+++ b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
@@ -24,5 +24,5 @@ source $1
 
 mkdir -p $CJE_ROOT/$TMP_DIR
 pushd $CJE_ROOT/$TMP_DIR
-wget --recursive --no-parent --no-verbose http://$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID
-popd
\ No newline at end of file
+wget --recursive --no-parent --no-verbose http://$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID &
+popd
diff --git a/cje-production/mbscripts/mb100_cloneRepos.sh b/cje-production/mbscripts/mb100_cloneRepos.sh
index de3525ade..a06fe284c 100755
--- a/cje-production/mbscripts/mb100_cloneRepos.sh
+++ b/cje-production/mbscripts/mb100_cloneRepos.sh
@@ -24,4 +24,4 @@ source $1
 
 git clone -b $BRANCH --recursive $GIT_ROOT$AGG_REPO ../$AGG_DIR
 cd ../$AGG_DIR
-git submodule foreach 'git fetch; SUBMODULE_BRANCH=$(grep $name: ../../../streams/repositories_$PATCH_OR_BRANCH_LABEL.txt | cut -f2 -d\ ); SUBMODULE_BRANCH=${SUBMODULE_BRANCH:-$BRANCH}; echo Checking out origin/$SUBMODULE_BRANCH; git checkout origin/$SUBMODULE_BRANCH'
\ No newline at end of file
+git submodule foreach 'git fetch; SUBMODULE_BRANCH=$(grep $name: ../../../streams/repositories_$PATCH_OR_BRANCH_LABEL.txt | cut -f2 -d\ ); SUBMODULE_BRANCH=${SUBMODULE_BRANCH:-$BRANCH}; echo Checking out origin/$SUBMODULE_BRANCH; git checkout origin/$SUBMODULE_BRANCH'
diff --git a/cje-production/mbscripts/mb200_createSourceBundles.sh b/cje-production/mbscripts/mb200_createSourceBundles.sh
index 5a63bd39b..62e509d48 100755
--- a/cje-production/mbscripts/mb200_createSourceBundles.sh
+++ b/cje-production/mbscripts/mb200_createSourceBundles.sh
@@ -23,4 +23,4 @@ source $CJE_ROOT/scripts/common-functions.shsource
 source $1
 
 cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
-mvn clean verify -f eclipse-platform-sources/pom.xml -DbuildId=$BUILD_ID
\ No newline at end of file
+mvn clean verify -f eclipse-platform-sources/pom.xml -DbuildId=$BUILD_ID
diff --git a/cje-production/mbscripts/mb210_updatePom.sh b/cje-production/mbscripts/mb210_updatePom.sh
index 1d9146d6b..14d073918 100755
--- a/cje-production/mbscripts/mb210_updatePom.sh
+++ b/cje-production/mbscripts/mb210_updatePom.sh
@@ -47,4 +47,4 @@ else
     echo "INFO: Changes in pom versions: $changes" >&2
     RC=0
   fi
-fi
\ No newline at end of file
+fi
diff --git a/cje-production/mbscripts/mb220_buildSdkPatch.sh b/cje-production/mbscripts/mb220_buildSdkPatch.sh
index 6212a100d..f680433f7 100755
--- a/cje-production/mbscripts/mb220_buildSdkPatch.sh
+++ b/cje-production/mbscripts/mb220_buildSdkPatch.sh
@@ -33,4 +33,4 @@ mvn clean verify -DskipTests=true -Pbree-libs \
   -DbuildTimestamp=$TIMESTAMP \
   -DbuildType=$BUILD_TYPE \
   -DbuildId=$BUILD_ID \
-  -Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE
\ No newline at end of file
+  -Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE
diff --git a/cje-production/mbscripts/mb300_gatherParts.sh b/cje-production/mbscripts/mb300_gatherParts.sh
index c50b4a108..7af628759 100755
--- a/cje-production/mbscripts/mb300_gatherParts.sh
+++ b/cje-production/mbscripts/mb300_gatherParts.sh
@@ -143,4 +143,4 @@ if [ -d $CJE_ROOT/$AGG_DIR ]; then
   mkdir -p $comparatorlogsDir
   find . -regex .*target/artifactcomparison -type d -exec zip -r $comparatorlogsDir/artifactcomparisons.zip '{}' \;
   popd
-fi
\ No newline at end of file
+fi
diff --git a/cje-production/mbscripts/mb500_createRepoReports.sh b/cje-production/mbscripts/mb500_createRepoReports.sh
index dde770dd8..73b19891a 100755
--- a/cje-production/mbscripts/mb500_createRepoReports.sh
+++ b/cje-production/mbscripts/mb500_createRepoReports.sh
@@ -19,6 +19,8 @@ if [ $# -ne 1 ]; then
   exit 1
 fi
 
+wait
+
 source $CJE_ROOT/scripts/common-functions.shsource
 source $1
 
@@ -36,4 +38,4 @@ mkdir -p $output_dir
 $report_app_dir/p2analyze/p2analyze -data $output_dir/workspace-report -vm $JAVA_HOME/bin -vmargs -Xmx1g \
     -DreferenceRepo=$CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID \
     -DreportRepoDir=$buildToTest \
-    -DreportOutputDir=$output_dir
\ No newline at end of file
+    -DreportOutputDir=$output_dir &