Bug 399180 - [CBI] restructure aggregator and output directories

6 files changed, 14 insertions, 7 deletions

diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 8120870f4..67841f8c2 100755
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -227,7 +227,14 @@ fn-build-dir ()
     ROOT="$1"; shift
     BRANCH="$1"; shift
     BUILD_ID="$1"; shift
-    echo $ROOT/$BRANCH/dirs/$BUILD_ID
+    STREAM="$1"; shift
+    eclipseStreamMajor=${STREAM:0:1}
+    dropDirSegment=siteDir/eclipse/downloads/dropscbibased
+    if [[ $eclipseStreamMajor > 3 ]] 
+    then
+        dropDirSegment=siteDir/eclipse/downloads/drops4cbibased
+    fi
+    echo $ROOT/$BRANCH/$dropDirSegment/$BUILD_ID
 }
 
 # USAGE: fn-basebuilder-dir ROOT BRANCH BASEBUILDER_TAG
@@ -239,7 +246,7 @@ fn-basebuilder-dir ()
     ROOT="$1"; shift
     BRANCH="$1"; shift
     BASEBUILDER_TAG="$1"; shift
-    echo $ROOT/$BRANCH/org.eclipse.releng.basebuilder_$BASEBUILDER_TAG
+    echo $ROOT/org.eclipse.releng.basebuilder_$BASEBUILDER_TAG
 }
 
 
diff --git a/scripts/gather-parts.sh b/scripts/gather-parts.sh
index 79488a167..a3206b665 100644
--- a/scripts/gather-parts.sh
+++ b/scripts/gather-parts.sh
@@ -33,7 +33,7 @@ if [ -z "$BUILD_ID" ]; then
 	BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
 fi
 
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM")
 basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
 
 fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
diff --git a/scripts/master-build.sh b/scripts/master-build.sh
index 08ed0b20b..afe378a76 100644
--- a/scripts/master-build.sh
+++ b/scripts/master-build.sh
@@ -28,7 +28,7 @@ cd $BUILD_ROOT
 
 
 BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
 logsDirectory="${buildDirectory}/buildlogs"
 mkdir -p "${logsDirectory}"
 checkForErrorExit $? "Could not create buildlogs directory"
diff --git a/scripts/parse-logs.sh b/scripts/parse-logs.sh
index 1c2fb7149..69bdc49b1 100644
--- a/scripts/parse-logs.sh
+++ b/scripts/parse-logs.sh
@@ -33,7 +33,7 @@ if [ -z "$BUILD_ID" ]; then
 	BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
 fi
 
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "${STREAM}" )
 basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
 
 fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
diff --git a/scripts/pom-version-updater.sh b/scripts/pom-version-updater.sh
index bd7a71ac8..8a4ab0ec0 100644
--- a/scripts/pom-version-updater.sh
+++ b/scripts/pom-version-updater.sh
@@ -26,7 +26,7 @@ cd $BUILD_ROOT
 # derived values
 gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
 aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
 
 if [ -z "$BUILD_ID" ]; then
 	BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
diff --git a/scripts/publish-eclipse.sh b/scripts/publish-eclipse.sh
index cd946b4f4..97085e9f0 100644
--- a/scripts/publish-eclipse.sh
+++ b/scripts/publish-eclipse.sh
@@ -33,7 +33,7 @@ if [ -z "$BUILD_ID" ]; then
     BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
 fi
 
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
 basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
 
 fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"