Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2020-09-29 09:55:34 +0000
committerSravan Kumar Lakkimsetti2020-09-29 09:55:34 +0000
commit8e409834ac2a6b0ac0da97c5082a26fccf1793ba (patch)
tree1dc89737fceed9503ebc905be63103ce1281f468
parentfd4c41f9d70f3962976252c57de3a3a633eeb535 (diff)
downloadeclipse.platform.releng.aggregator-8e409834ac2a6b0ac0da97c5082a26fccf1793ba.tar.gz
eclipse.platform.releng.aggregator-8e409834ac2a6b0ac0da97c5082a26fccf1793ba.tar.xz
eclipse.platform.releng.aggregator-8e409834ac2a6b0ac0da97c5082a26fccf1793ba.zip
build failure in Y-builds
Change-Id: Id8a2959164026885dc826a5ff51d66b4e1c1a589 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--JenkinsJobs/Builds/Y-build.groovy16
-rw-r--r--cje-production/Y-build/buildproperties.txt2
-rwxr-xr-xcje-production/mbscripts/mb300_gatherEclipseParts.sh2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml1
4 files changed, 12 insertions, 9 deletions
diff --git a/JenkinsJobs/Builds/Y-build.groovy b/JenkinsJobs/Builds/Y-build.groovy
index 530438cf0..ae982bc91 100644
--- a/JenkinsJobs/Builds/Y-build.groovy
+++ b/JenkinsJobs/Builds/Y-build.groovy
@@ -1,8 +1,8 @@
pipeline {
options {
- timeout(time: 390, unit: 'MINUTES')
+ timeout(time: 360, unit: 'MINUTES')
timestamps()
- buildDiscarder(logRotator(numToKeepStr:'5'))
+ buildDiscarder(logRotator(numToKeepStr:'25'))
}
agent {
kubernetes {
@@ -15,14 +15,14 @@ spec:
containers:
- name: "jnlp"
image: "eclipsecbijenkins/jipp-migration-agent:4.3"
- imagePullPolicy: "IfNotPresent"
+ imagePullPolicy: "Always"
resources:
limits:
memory: "8192Mi"
- cpu: "2000m"
+ cpu: "4000m"
requests:
memory: "6144Mi"
- cpu: "1000m"
+ cpu: "2000m"
securityContext:
privileged: false
tty: true
@@ -169,7 +169,7 @@ spec:
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
- withAnt(installation: 'apache-ant-latest') {
+ withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk11-latest') {
sh '''
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb020_createBaseBuilder.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb020_createBaseBuilder.sh.log
@@ -298,7 +298,7 @@ spec:
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
- withAnt(installation: 'apache-ant-latest') {
+ withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk11-latest') {
sh '''
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log
@@ -317,7 +317,7 @@ spec:
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
- withAnt(installation: 'apache-ant-latest') {
+ withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk11-latest') {
sh '''
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb310_gatherEquinoxParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb310_gatherEquinoxParts.sh.log
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index 4b43bbd83..63c9a436e 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -43,7 +43,7 @@ API_PREV_REF_LABEL="4.17"
#API_FREEZE_REF_LABEL="4.17RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
-#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.16RC1-202005280200/eclipse-SDK-4.16RC1-win32-x86_64.zip -DfreezeName=Eclipse-SDK-4.16RC1 -DfreezeFilename=eclipse-SDK-4.16RC1-win32-x86_64.zip"
+#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202008261800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
# Otherwise set to a blank space
FREEZE_PARAMS=" "
diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index b1e57c92a..7711d52e8 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -109,6 +109,7 @@ if [ -z $PATCH_BUILD ]; then
popd
fi
+ set -x
# slice repos
ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/repos/buildAll.xml
if [ -d $PLATFORM_REPO_DIR ]; then
@@ -128,6 +129,7 @@ if [ -z $PATCH_BUILD ]; then
-v
popd
fi
+ set +x
fi
# gather ecj jars
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml
index 5f5d6477e..eebe878bf 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml
@@ -81,6 +81,7 @@
<property name="featureTemp" value="${eclipse.build.configs}/repos/featureTemp" />
<delete dir="${featureTemp}" />
<mkdir dir="${featureTemp}" />
+ <echo message="buildRepo: {buildRepo}" />
<p2.mirror source="file://${buildRepo}">
<destination kind="metadata" location="file://${featureTemp}" name="@{feature} Repo" format="file://${buildRepo}" />
<destination kind="artifact" location="file://${featureTemp}" name="@{feature} Repo" format="file://${buildRepo}" />

Back to the top