diff options
author | Sravan Kumar Lakkimsetti | 2021-03-19 09:10:38 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2021-03-19 09:26:03 +0000 |
commit | 8913f2f8df4fe52de70ed581a75f76c3a8f73797 (patch) | |
tree | 20e83982f51103d14ccbcfbe6c608a5cb8053188 | |
parent | 60bbf8678195643c16db6e2b1e5d862b57f6fc0e (diff) | |
download | eclipse.platform.releng.aggregator-8913f2f8df4fe52de70ed581a75f76c3a8f73797.tar.gz eclipse.platform.releng.aggregator-8913f2f8df4fe52de70ed581a75f76c3a8f73797.tar.xz eclipse.platform.releng.aggregator-8913f2f8df4fe52de70ed581a75f76c3a8f73797.zip |
Bug 572057 - Parallelize mac notarization steps
- Parallelized equinox as well
Change-Id: Id1c979ed5c112676105add3bb2364a6b2c7c5ddc
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rwxr-xr-x | cje-production/mbscripts/mb300_gatherEclipseParts.sh | 10 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb310_gatherEquinoxParts.sh | 15 |
2 files changed, 20 insertions, 5 deletions
diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh index 2cf252196..5bb3ff059 100755 --- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh +++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh @@ -74,13 +74,13 @@ if [ -z $PATCH_BUILD ]; then chmod +x $CJE_ROOT/scripts/notarizeMacApp.sh NOTARIZE_LOG_DIR=$CJE_ROOT/notarizeLog mkdir -p $NOTARIZE_LOG_DIR - (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg > $NOTARIZE_LOG_DIR/sdkX64.log 2>&1)& - sleep 1m (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-arm64.dmg > $NOTARIZE_LOG_DIR/sdkArm64.log 2>&1)& - sleep 1m - (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg > $NOTARIZE_LOG_DIR/platformX64.log 2>&1)& - sleep 1m + sleep 18s + (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg > $NOTARIZE_LOG_DIR/sdkX64.log 2>&1)& + sleep 18s (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-arm64.dmg > $NOTARIZE_LOG_DIR/platformArm64.log 2>&1)& + sleep 18s + (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg > $NOTARIZE_LOG_DIR/platformX64.log 2>&1)& fi diff --git a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh index 61c6b3f2f..55872e46b 100755 --- a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh +++ b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh @@ -35,7 +35,11 @@ if [ -d $REPO_DIR ]; then cp org.eclipse.rt.osgistarterkit.product-macosx.cocoa.arm64.dmg $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-arm64.dmg cp org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-win32-win32-x86_64.zip popd + chmod +x $CJE_ROOT/scripts/notarizeMacApp.sh + NOTARIZE_LOG_DIR=$CJE_ROOT/notarizeEqLog + mkdir -p $NOTARIZE_LOG_DIR fn-notarize-macbuild "$CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID" EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-x86_64.dmg + (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID" EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-x86_64.dmg > $NOTARIZE_LOG_DIR/equinoxX64.log 2>&1)& fi # gather Equinox SDK @@ -78,3 +82,14 @@ ${JAVA_HOME}/bin/java -jar $LAUNCHER_JAR \ -v \ publish popd + +wait +if [ -d $NOTARIZE_LOG_DIR ]; then + pushd $NOTARIZE_LOG_DIR + for i in $(ls *.log) + do + echo $i + cat $i + done +fi + |