Bug 578179 - Remove "Update poms..." build stage
All that is does is produce a change (use single Tycho version when
multiple are referenced) so smth that will fail on gerrit and locally
will build which imho shouldn't be a goal at all.
Change-Id: Ib1e3a9e2795384c8496de6e0b4ce78324f86fe81
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/189525
Tested-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
diff --git a/JenkinsJobs/Builds/I-build.groovy b/JenkinsJobs/Builds/I-build.groovy
index a77086d..3bdaa03 100644
--- a/JenkinsJobs/Builds/I-build.groovy
+++ b/JenkinsJobs/Builds/I-build.groovy
@@ -279,27 +279,6 @@
}
}
}
- stage('Update Pom files in the source'){
- steps {
- container('jnlp') {
- withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
- sshagent(['git.eclipse.org-bot-ssh']) {
- sh '''
- cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
- unset JAVA_TOOL_OPTIONS
- unset _JAVA_OPTIONS
- ./mb210_updatePom.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb210_updatePom.sh.log
- if [[ ${PIPESTATUS[0]} -ne 0 ]]
- then
- echo "Failed in Update Pom files in the source stage"
- exit 1
- fi
- '''
- }
- }
- }
- }
- }
stage('Aggregator maven build'){
environment {
KEYRING = credentials('secret-subkeys-releng.asc')
diff --git a/JenkinsJobs/Builds/Y-build.groovy b/JenkinsJobs/Builds/Y-build.groovy
index 741c699..c958328 100644
--- a/JenkinsJobs/Builds/Y-build.groovy
+++ b/JenkinsJobs/Builds/Y-build.groovy
@@ -294,27 +294,6 @@
}
}
}
- stage('Update Pom files in the source'){
- steps {
- container('jnlp') {
- withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
- sshagent(['git.eclipse.org-bot-ssh']) {
- sh '''
- cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
- unset JAVA_TOOL_OPTIONS
- unset _JAVA_OPTIONS
- ./mb210_updatePom.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb210_updatePom.sh.log
- if [[ ${PIPESTATUS[0]} -ne 0 ]]
- then
- echo "Failed in Update Pom files in the source stage"
- exit 1
- fi
- '''
- }
- }
- }
- }
- }
stage('Aggregator maven build'){
environment {
KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
diff --git a/cje-production/mbscripts/mb210_updatePom.sh b/cje-production/mbscripts/mb210_updatePom.sh
deleted file mode 100755
index f62eef7..0000000
--- a/cje-production/mbscripts/mb210_updatePom.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-#*******************************************************************************
-# Copyright (c) 2021 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Kit Lo - initial API and implementation
-#*******************************************************************************
-
-if [ $# -ne 1 ]; then
- echo USAGE: $0 env_file
- exit 1
-fi
-
-source $CJE_ROOT/scripts/common-functions.shsource
-source $1
-
-REPO_DIR=$CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
-BUILD_DIR=$CJE_ROOT/$DROP_DIR/$BUILD_ID
-mkdir $CJE_ROOT/tmp
-
-cd $REPO_DIR
-mvn --update-snapshots org.eclipse.tycho:tycho-versions-plugin:2.5.0:update-pom \
- -Dmaven.repo.local=$LOCAL_REPO \
- -Djava.io.tmpdir=$CJE_ROOT/tmp \
- -DaggregatorBuild=true \
- -DbuildTimestamp=$TIMESTAMP \
- -DbuildType=$BUILD_TYPE \
- -DbuildId=$BUILD_ID \
- -Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE
-
-RC=$?
-if [[ $RC != 0 ]]
-then
- echo "ERROR: tycho-versions-plugin:update-pom returned non-zero return code: $RC" >&2
-else
- changes=$( git status --short -uno | cut -c4- )
- if [ -z "$changes" ]; then
- echo "INFO: No changes in pom versions" >&2
- RC=0
- else
- echo "INFO: Changes in pom versions: $changes" >&2
- RC=0
- fi
-fi
-
-pushd "$REPO_DIR"
-POM_UPDATES_SUBJECT=" "
-POM_UPDATES=" "
-mkdir -p "$BUILD_DIR"/pom_updates
-git submodule foreach "if (git status -s -uno | grep pom.xml >/dev/null ); then git diff >$BUILD_DIR/pom_updates/\$name.diff; fi "
-pushd "$BUILD_DIR"/pom_updates
-nDiffs=$( ls -1 $BUILD_DIR/pom_updates/*.diff | wc -l )
-# do not create index.html if no diffs to display, as our PHP DL page knows
-# not to display link if index.html is not present.
-if (( $nDiffs > 0 ))
-then
- POM_UPDATES=""
- echo "<html>" >index.html
- echo "<head>" >>index.html
- echo "<title>POM version report for $BUILD_ID</title>" >>index.html
- echo "</head>" >>index.html
- echo "<body>" >>index.html
- echo "<h1>POM version report for $BUILD_ID</h1>" >>index.html
- echo "<p>These repositories need patches to bring their pom.xml files up to the correct version.</p>" >>index.html
- echo "<ul>" >>index.html
-
- for f in *.diff; do
- FNAME=$( basename $f .diff )
- echo "<li><a href=\"$f\">$FNAME</a></li>" >> index.html
- done
- echo "</ul>" >> index.html
- echo "</html>" >> index.html
- POM_UPDATES="Check POM Updates made by tycho's pom-updater plugin:<br> <a href='https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/pom_updates/'>https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/pom_updates/</a><br><br>"
- POM_UPDATES_SUBJECT=" - POM Updates Required"
-fi
-popd
-popd
-# we write to property files, for later use in email message
-fn-write-property POM_UPDATES_BODY "\"${POM_UPDATES}\""
-fn-write-property POM_UPDATES_SUBJECT "\"${POM_UPDATES_SUBJECT}\""
-
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java18.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java18.php
index 3d0eb75..92666a3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java18.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java18.php
@@ -96,9 +96,6 @@
<p style="padding-bottom: 1em">This page provides access to the various deliverables of Eclipse Platform build along with
its logs and tests.</p>
<?php
-if (file_exists("pom_updates/index.html")) {
- echo "<h2><a href=\"pom_updates/\">POM updates made</a></h2>";
-}
// check if test build only, just to give warning of oversite.
// see bug 404545
if (isset($testbuildonly) && ($testbuildonly)) {
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php
index 9b84753..8ee398b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php
@@ -96,9 +96,6 @@
<p style="padding-bottom: 1em">This page provides access to the various deliverables of Eclipse Platform build along with
its logs and tests.</p>
<?php
-if (file_exists("pom_updates/index.html")) {
- echo "<h2><a href=\"pom_updates/\">POM updates made</a></h2>";
-}
// check if test build only, just to give warning of oversite.
// see bug 404545
if (isset($testbuildonly) && ($testbuildonly)) {
