Skip to content

Commit b2245e2

Browse files
committed
[Build] Remove unused scripts and unnecessary releng-script deployments
All removed scripts are not referenced anywhere anymore.
1 parent a34b928 commit b2245e2

File tree

11 files changed

+3
-319
lines changed

11 files changed

+3
-319
lines changed

JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ pipeline {
280280
--include MANIFEST.MF \
281281
--include feature.xml \
282282
--include \\*.product \
283+
--include \\*.sh \
283284
--fixed-strings "${PREVIOUS_RELEASE_VERSION}")
284285
# The eclipse-platform-parent/pom.xml contains the previous version in the baseline repository variable
285286
if [[ -z "${matchingFiles}" ]] || [[ "${matchingFiles}" == 'eclipse-platform-parent/pom.xml' ]]; then

JenkinsJobs/Releng/promoteBuild.jenkinsfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,6 @@ pipeline {
213213
utilities.replaceAllInFile('eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties', [
214214
'previousReleaseVersion=.*' : "previousReleaseVersion=${BUILD_MAJOR}.${BUILD_MINOR}",
215215
])
216-
utilities.replaceAllInFile('eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh', [
217-
'R\\/R-\\d+.\\d+-\\d{12}' : "R/${DL_DROP_ID}",
218-
'-\\d+.\\d+-linux-gtk-' : "-${BUILD_MAJOR}.${BUILD_MINOR}-linux-gtk-",
219-
])
220216
utilities.replaceAllInFile('production/testScripts/configuration/streamSpecific.properties', [
221217
'previousReleaseLocation=.*' : 'previousReleaseLocation=https://\\${DOWNLOAD_HOST}/eclipse/downloads/drops4/' + DL_DROP_ID + '/',
222218
'previousReleaseVersion=.*' : "previousReleaseVersion=${BUILD_MAJOR}.${BUILD_MINOR}",

Jenkinsfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pipeline {
3636
return !sh(script:'''
3737
latestCommitID=$(curl https://download.eclipse.org/eclipse/relengScripts/state)
3838
git diff --name-only ${latestCommitID} HEAD \\
39-
production/ scripts/ cje-production/ eclipse.platform.releng.tychoeclipsebuilder/
39+
production/ cje-production/ eclipse.platform.releng.tychoeclipsebuilder/
4040
''', returnStdout: true).trim().isEmpty()
4141
}
4242
}
@@ -53,10 +53,8 @@ pipeline {
5353
ssh [email protected] mkdir -p ${serverStaging}/testScripts
5454
scp -r production/testScripts/bootstrap [email protected]:${serverStaging}/testScripts
5555
56-
scp -r scripts [email protected]:${serverStaging}
5756
scp -r cje-production [email protected]:${serverStaging}
5857
59-
scp -r eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts [email protected]:${serverStaging}
6058
scp -r eclipse.platform.releng.tychoeclipsebuilder/entitlement [email protected]:${serverStaging}
6159
6260
# Create state file that contains the current commitID for later diffs in this stage's conditional

RELEASE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ Previously they were created in ther own job:
170170
- Update previous-release.baseline in [eclipse-platform-parent/pom.xml](eclipse-platform-parent/pom.xml)
171171
- Update the last release build versions in [eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties](eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties)
172172
- Update the previousReleaseVersion in [eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties](eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties)
173-
- Update the name of the copied files in [eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh](eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh)
174173

175174
**RC2a Release**
176175
* Sometimes there is a critical issue that requires a fix, if it's decided that one is needed then an RC2a (followed by RC2b, RC2c etc if necessary) is built from the maintenance branch and promoted using the RC2 process.

cje-production/master-build.sh

Lines changed: 0 additions & 46 deletions
This file was deleted.

cje-production/readme.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,8 @@ Here are some ground rules
66
100-199 - cloning repos and preparing them with right branches/tags and tagging(git operations)
77
200-299 - Maven operations(Updating pom with versions from manifest, create tar ball, build SDK/patch etc)
88
300-399 - gather parts (collecting different artifacts into a temporary build location)
9-
400-499 - copy eclipse, repo and equinox artifacts to respective temporary download locations and generate necessary web pages
109
500-599 - Generate build reports (running p2.repo.analyzers and dirt report, jdeps reports etc)
1110
600-699 - promote the build to download.eclipse.org.
12-
700-799 - trigger tests and send mails
1311

1412
2. Every script should accept $ENV_FILE. this envrironment file is created at the preparing the build environment stage.
1513
3. Every script should source "common-functions.shsource". This will contain common methods used across the scripts
16-
17-
18-
Folder structure
19-
root (cje-production)
20-
readme.txt
21-
mbscripts
22-
common
23-
master-build.sh
24-
siteDir (temporary location to hold the website)
25-
26-

cje-production/scripts/common-functions.shsource

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# USAGE: fn-write-property VAR_NAME
1717
# VAR_NAME: Variable name to write as "variable=value" form
1818
# This script assumes the following variables have been defined and are pointing
19-
# to an appropriate file (see master-build.sh):
19+
# to an appropriate file:
2020
# BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource
2121
# BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php
2222
# BUILD_ENV_FILE_PROP=${buildDirectory}/buildproperties.properties
@@ -31,78 +31,3 @@ fn-write-property ()
3131
echo "\$$1 = $2;" >> $BUILD_ENV_FILE_PHP
3232
echo "$1 = $2" >> $BUILD_ENV_FILE_PROP
3333
}
34-
35-
# this function executes command passed as command line parameter and
36-
# if that command fails it exit with the same error code as the failed command
37-
fn-run-command ()
38-
{
39-
$*
40-
returnCode=$?
41-
if [ $returnCode != 0 ]; then
42-
echo "Execution of \"$*\" failed with return code : $returnCode"
43-
exit $returnCode
44-
fi
45-
}
46-
47-
fn-notarize-macbuild ()
48-
{
49-
set -x
50-
BUILD_DIR="$1"; shift
51-
DMG="$1"; shift
52-
53-
pushd "$BUILD_DIR" || exit 5
54-
55-
PRIMARY_BUNDLE_ID="${DMG//-macosx-cocoa-x86_64.dmg/}"
56-
57-
retryCount=3
58-
while [ ${retryCount} -gt 0 ]; do
59-
60-
RAW_RESPONSE=$(curl -sS --write-out "\n%{http_code}" -X POST -F file=@"${DMG}" -F 'options={"primaryBundleId": "'"${PRIMARY_BUNDLE_ID}"'", "staple": true};type=application/json' https://cbi.eclipse.org/macos/xcrun/notarize || : )
61-
62-
RESPONSE=$(head -n-1 <<<"${RAW_RESPONSE}")
63-
STATUS_CODE=$(tail -n1 <<<"${RAW_RESPONSE}")
64-
65-
if [[ "${STATUS_CODE}" != "200" ]]; then
66-
echo "Bad response from the server (status=${STATUS_CODE})"
67-
echo "${RESPONSE}"
68-
retryCount=$((retryCount - 1))
69-
if [ $retryCount -eq 0 ]; then
70-
echo "Notarization failed 3 times. Exiting"
71-
exit 1
72-
else
73-
echo "Retrying..."
74-
sleep 2
75-
fi
76-
fi
77-
78-
UUID=$(echo "$RESPONSE" | grep -Po '"uuid"\s*:\s*"\K[^"]+' || : )
79-
STATUS=$(echo "$RESPONSE" | grep -Po '"status"\s*:\s*"\K[^"]+' || : )
80-
81-
while [[ ${STATUS} == 'IN_PROGRESS' ]]; do
82-
sleep 1m
83-
RESPONSE=$(curl -sS "https://cbi.eclipse.org/macos/xcrun/${UUID}/status")
84-
STATUS=$(echo "$RESPONSE" | grep -Po '"status"\s*:\s*"\K[^"]+' || : )
85-
done
86-
87-
if [[ ${STATUS} != 'COMPLETE' ]]; then
88-
echo "Notarization failed: ${RESPONSE}"
89-
retryCount=$((retryCount - 1))
90-
if [ $retryCount -eq 0 ]; then
91-
echo "Notarization failed 3 times. Exiting"
92-
exit 1
93-
else
94-
echo "Retrying..."
95-
sleep 2
96-
fi
97-
else
98-
break
99-
fi
100-
101-
done
102-
103-
rm "${DMG}"
104-
105-
curl -sSJO "https://cbi.eclipse.org/macos/xcrun/${UUID}/download"
106-
popd || exit 5
107-
set +x
108-
}

eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_convert.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)