Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-06-12 01:50:39 -0400
committerSravan Kumar Lakkimsetti2019-06-12 02:00:56 -0400
commit87886758d7cac074b1f1f957731367ff1316f963 (patch)
tree3533132ef28fdfd2efbf5ef478fc43cef05cb948 /cje-production/mbscripts
parent96f24d6d90d0c8d1a7a7d55215b497919744ef77 (diff)
downloadeclipse.platform.releng.aggregator-87886758d7cac074b1f1f957731367ff1316f963.tar.gz
eclipse.platform.releng.aggregator-87886758d7cac074b1f1f957731367ff1316f963.tar.xz
eclipse.platform.releng.aggregator-87886758d7cac074b1f1f957731367ff1316f963.zip
Bug 548172 - Integrate new build scripts developed in bug 541301
-migrated to 4.13 -removed debugging statements -updated maven build script to use different options on jenkins and local Change-Id: I80ef4ab3df22091c751b4bea9920e86e68d09a4f Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'cje-production/mbscripts')
-rwxr-xr-xcje-production/mbscripts/mb010_createEnvfiles.sh2
-rwxr-xr-xcje-production/mbscripts/mb020_createBaseBuilder.sh2
-rwxr-xr-xcje-production/mbscripts/mb030_downloadBuildToCompare.sh2
-rwxr-xr-xcje-production/mbscripts/mb100_cloneRepos.sh2
-rwxr-xr-xcje-production/mbscripts/mb110_tagBuildInputs.sh2
-rwxr-xr-xcje-production/mbscripts/mb200_createSourceBundles.sh2
-rwxr-xr-xcje-production/mbscripts/mb210_updatePom.sh2
-rwxr-xr-xcje-production/mbscripts/mb220_buildSdkPatch.sh11
-rwxr-xr-xcje-production/mbscripts/mb300_gatherEclipseParts.sh2
-rwxr-xr-xcje-production/mbscripts/mb310_gatherEquinoxParts.sh2
-rwxr-xr-xcje-production/mbscripts/mb500_createRepoReports.sh2
-rwxr-xr-xcje-production/mbscripts/mb510_createApiToolsReports.sh2
12 files changed, 20 insertions, 13 deletions
diff --git a/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh
index c990c2490..6f16eb62e 100755
--- a/cje-production/mbscripts/mb010_createEnvfiles.sh
+++ b/cje-production/mbscripts/mb010_createEnvfiles.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb020_createBaseBuilder.sh b/cje-production/mbscripts/mb020_createBaseBuilder.sh
index 096e5b9d3..06618707c 100755
--- a/cje-production/mbscripts/mb020_createBaseBuilder.sh
+++ b/cje-production/mbscripts/mb020_createBaseBuilder.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
index b2a9e4b6d..1c65917d5 100755
--- a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
+++ b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb100_cloneRepos.sh b/cje-production/mbscripts/mb100_cloneRepos.sh
index a06fe284c..85ea1de6c 100755
--- a/cje-production/mbscripts/mb100_cloneRepos.sh
+++ b/cje-production/mbscripts/mb100_cloneRepos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb110_tagBuildInputs.sh b/cje-production/mbscripts/mb110_tagBuildInputs.sh
index 6ea011d8f..f09e4f604 100755
--- a/cje-production/mbscripts/mb110_tagBuildInputs.sh
+++ b/cje-production/mbscripts/mb110_tagBuildInputs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb200_createSourceBundles.sh b/cje-production/mbscripts/mb200_createSourceBundles.sh
index 62e509d48..7fd8486c9 100755
--- a/cje-production/mbscripts/mb200_createSourceBundles.sh
+++ b/cje-production/mbscripts/mb200_createSourceBundles.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb210_updatePom.sh b/cje-production/mbscripts/mb210_updatePom.sh
index 14d073918..72f0a6b11 100755
--- a/cje-production/mbscripts/mb210_updatePom.sh
+++ b/cje-production/mbscripts/mb210_updatePom.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb220_buildSdkPatch.sh b/cje-production/mbscripts/mb220_buildSdkPatch.sh
index 53b9c87ef..9312629e3 100755
--- a/cje-production/mbscripts/mb220_buildSdkPatch.sh
+++ b/cje-production/mbscripts/mb220_buildSdkPatch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
@@ -22,8 +22,15 @@ fi
source $CJE_ROOT/scripts/common-functions.shsource
source $1
+if [[ -z "${WORKSPACE}" ]]
+then
+ MVN_ARGS=""
+else
+ MVN_ARGS="-Pbree-libs -Psign"
+fi
+
cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
-mvn clean verify -DskipTests=true -Pbree-libs \
+mvn clean verify -DskipTests=true ${MVN_ARGS} \
-Dtycho.debug.artifactcomparator \
-Dtycho.localArtifacts=ignore \
-Dcbi.jarsigner.continueOnFail=true \
diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index 6010bbce6..e196b537f 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
index 3fbfbebb3..960f98734 100755
--- a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
+++ b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb500_createRepoReports.sh b/cje-production/mbscripts/mb500_createRepoReports.sh
index accd85d45..fe651855f 100755
--- a/cje-production/mbscripts/mb500_createRepoReports.sh
+++ b/cje-production/mbscripts/mb500_createRepoReports.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb510_createApiToolsReports.sh b/cje-production/mbscripts/mb510_createApiToolsReports.sh
index af7890262..a95d85783 100755
--- a/cje-production/mbscripts/mb510_createApiToolsReports.sh
+++ b/cje-production/mbscripts/mb510_createApiToolsReports.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
#*******************************************************************************
# Copyright (c) 2019 IBM Corporation and others.

Back to the top