Skip to content

Commit d6caa86

Browse files
committed
[Build] Move smoke tests into AutomatedTests folder
and rename dockerImage build. A separate folder for only one smoke-tests job is not really necessary.
1 parent f376227 commit d6caa86

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile renamed to JenkinsJobs/AutomatedTests/smokeTests.jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,12 @@ def createLabeledAgent(String agentLabel){
157157
def installJDK(String version, String os, String arch, String releaseType='ga') {
158158
// Translate os/arch names that are different in the Adoptium API
159159
if (os == 'win32') {
160-
os == 'windows'
160+
os = 'windows'
161161
} else if (os == 'macosx') {
162-
os == 'mac'
162+
os = 'mac'
163163
}
164164
if (arch == 'x86_64') {
165-
arch == 'x64'
165+
arch = 'x64'
166166
}
167167
dir ("${WORKSPACE}/java") {
168168
sh "curl -L https://api.adoptium.net/v3/binary/latest/${version}/${releaseType}/${os}/${arch}/jdk/hotspot/normal/eclipse | tar -xzf -"

JenkinsJobs/Builds/build.jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,9 @@ spec:
303303
]
304304
}
305305
}
306-
build job: 'SmokeTests/StartSmokeTests', wait: false, parameters: [string(name: 'buildId', value: "${BUILD_IID}")]
306+
build job: 'AutomatedTests/smokeTests', wait: false, parameters: [
307+
string(name: 'buildId', value: "${BUILD_IID}")
308+
]
307309
}
308310
}
309311
stage('Trigger publication to Maven snapshots repo') {

JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ pipeline {
289289
replaceInFile('JenkinsJobs/Builds/build.jenkinsfile', [
290290
"typeName: 'Integration' , branchLabel: 'master'" : "typeName: 'Integration' , branchLabel: '${MAINTENANCE_BRANCH}'",
291291
])
292-
replaceInFile('JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile', [
292+
replaceInFile('JenkinsJobs/Builds/dockerImages.jenkinsfile', [
293293
'-b master' : "-b ${MAINTENANCE_BRANCH}",
294294
])
295295
replaceInFile('cje-production/buildproperties.txt', [

JenkinsJobs/seedJob.jenkinsfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ pipeline {
2222
'YPBuilds': [displayName: 'Y and P Builds', description: 'Builds and tests for the beta java builds.'],
2323
'Cleanup': [description: 'Cleanup Scripts.'],
2424
'Releng': [description: 'Jobs related to routine releng tasks. Some are periodic, some are "manual" jobs ran only when needed.'],
25-
'SmokeTests': [displayName: 'Smoke Tests', description: 'Folder for Smoke Tests'],
2625
]
2726
def allJenkinsFiles = sh(script: 'ls **/*${JENKINS_FILE_EXTENSION}', returnStdout: true).trim().split('\\s')
2827
def pipelineJobDefinitions = [:]

0 commit comments

Comments
 (0)