Skip to content

Commit 4ed6b33

Browse files
committed
[I/Y-Build] Fix path of lastTag file and mailing list for aborted builds
Follow-up on - #3406
1 parent 0071e20 commit 4ed6b33

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

JenkinsJobs/Builds/build.jenkinsfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ spec:
107107
source $CJE_ROOT/buildproperties.shsource
108108
updateSiteRootPath=/home/data/httpd/download.eclipse.org/eclipse/updates/${STREAMMajor}.${STREAMMinor}-${BUILD_TYPE}-builds
109109
lastTagList=$(git tag --list "${BUILD_TYPE}*" | tail -n5 | tac)
110-
for lt in $lastTagList ; do
110+
for lt in ${lastTagList}; do
111111
if ssh genie.releng@projects-storage.eclipse.org test -d ${updateSiteRootPath}/${lt} ; then
112-
echo "$lt" > 'lastTag'
112+
echo "$lt" > "${WORKSPACE}/lastTag"
113113
exit 0
114114
fi
115115
done
116116
# if no build is promoted yet, then just fallback to the last tag of the current build type
117-
git describe --tags --match "${BUILD_TYPE}*" --abbrev=0 > 'lastTag'
117+
git describe --tags --match "${BUILD_TYPE}*" --abbrev=0 > "${WORKSPACE}/lastTag"
118118
'''
119119
}
120120
script { // Check for changes and abort if nothing changed since the last build
@@ -124,7 +124,7 @@ spec:
124124
No changes have been made since the last successful ${BUILD_TYPE}-Build and therefore this scheduled build was skipped:
125125
${BUILD_URL}console
126126
""".stripIndent(), mimeType: 'text/plain',
127-
to: "${MAILING_LIST}", from: 'genie.releng@eclipse.org'
127+
to: "${BUILD.mailingList}", from: 'genie.releng@eclipse.org'
128128
currentBuild.result = 'ABORTED'
129129
error('Abort scheduled build due to no changes')
130130
}
@@ -147,7 +147,7 @@ spec:
147147
sh '''#!/bin/bash -xe
148148
source $CJE_ROOT/buildproperties.shsource
149149
reportTimestamp=$(TZ="America/New_York" date +%Y%m%d-%H%M)
150-
export lastTag=$(cat lastTag)
150+
export lastTag=$(cat "${WORKSPACE}/lastTag")
151151
if [[ -n "$lastTag" ]]; then
152152
export gitLogFile="$CJE_ROOT/$DROP_DIR/$BUILD_ID/gitLog.html"
153153
mkdir -p $(dirname "${gitLogFile}")

0 commit comments

Comments
 (0)