Skip to content

Commit 142e5da

Browse files
committed
[I/Y-Build] Ensure build drop directory exists before result gathering
Due to the now parallel result gathering the existence of the build-drop site directory has to be ensured individually for eclipse and equinox. Follow up on - eclipse-platform#3502
1 parent cee49b5 commit 142e5da

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

JenkinsJobs/Builds/build.jenkinsfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ pipeline {
294294
sh '''#!/bin/bash -xe
295295
set -o pipefail
296296
source $CJE_ROOT/buildproperties.shsource
297+
mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID
297298
cp $CJE_ROOT/buildproperties.* $CJE_ROOT/$DROP_DIR/$BUILD_ID
298299
./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log
299300
'''
@@ -348,6 +349,7 @@ pipeline {
348349
sh '''#!/bin/bash -xe
349350
set -o pipefail
350351
source $CJE_ROOT/buildproperties.shsource
352+
mkdir -p $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID
351353
cp $CJE_ROOT/buildproperties.* $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID
352354
./mb310_gatherEquinoxParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb310_gatherEquinoxParts.sh.log
353355
'''

cje-production/mbscripts/mb300_gatherEclipseParts.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,10 @@ fi
2222
source $CJE_ROOT/scripts/common-functions.shsource
2323
source $1
2424

25-
mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID
26-
mkdir -p $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID
2725
mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID/testresults/consolelogs
2826

2927
JavaCMD=${JAVA_HOME}/bin/java
3028

31-
# gather maven properties
32-
cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties
33-
3429
# gather repo
3530
REPO_ZIP=$PLATFORM_TARGET_DIR/eclipse.platform.repository-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip
3631

@@ -109,7 +104,6 @@ fi
109104
-DbuildRepo=$PLATFORM_REPO_DIR \
110105
-DbuildDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \
111106
-DpostingDirectory=$CJE_ROOT/$DROP_DIR \
112-
-DequinoxPostingDirectory=$CJE_ROOT/$EQUINOX_DROP_DIR \
113107
-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
114108
-v
115109
popd

cje-production/mbscripts/mb310_gatherEquinoxParts.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ REPO_DIR=$ECLIPSE_BUILDER_DIR/equinox.starterkit.product/target/products
2828

2929
if [ -d $REPO_DIR ]; then
3030
pushd $REPO_DIR
31-
mkdir -p $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID
3231
cp org.eclipse.rt.osgistarterkit.product-linux.gtk.x86_64.tar.gz $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-linux-gtk-x86_64.tar.gz
3332
cp org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-x86_64.tar.gz
3433
cp org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.dmg $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-x86_64.dmg

0 commit comments

Comments
 (0)