11properties([
22 parameters([
33 string(name: 'executionId', defaultValue: UUID.randomUUID().toString(), description: 'Unique execution ID'),
4- string(name: 'ebcShortlist', defaultValue: 'rh-openjdk-qe- jenkins.yml',
4+ string(name: 'ebcShortlist', defaultValue: 'jenkins-child .yml',
55 description: 'This controls the EBC shortlist to use when provisioning a Jenkins node.'),
66 string(name: 'ecosystemTracking', defaultValue: "",
77 description: 'Tracking Map as string often containing information about CI Orchestrator pipeline'),
88 string(name: 'JENKINS_JOBS_BRANCH', defaultValue: 'dev', description: 'Branch of Jenkins jobs to use for scripts execution'),
99 string(name: 'JENKINS_JOBS_ORG', defaultValue: 'cognitive-software-delivery', description: 'GitHub Org of Jenkins jobs to use for scripts execution'),
1010 string(name: 'TEST_SUITE_BRANCH', defaultValue: 'main', description: 'Branch to test'),
1111 string(name: 'TEST_SUITE_URL',
12- defaultValue: 'git@ github.com: rh-openjdk/TestHeadlessComponents.git',
12+ defaultValue: 'https:// github.com/ rh-openjdk/TestHeadlessComponents.git',
1313 description: 'URL to download for prepared suites'),
1414 string(name: 'TEST_COMMAND',
1515 defaultValue: 'export TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \
@@ -27,8 +27,31 @@ properties([
2727timestamps {
2828 library 'jenkins-ci-websphere'
2929
30- if (shouldSkipDueToSeedJob()) {
30+ if (shouldSkipDueToSeedJob()) {i
3131 return;
3232 }
3333 println "Now you see me!"
34- }
34+ try {
35+ println "Requesting node from " + params.ebcShortlist + " with demand ID " + params.executionId
36+ onEBC(
37+ demandId: params.executionId,
38+ ebcShortlist: params.ebcShortlist,
39+ ebcPriority: params.ebcPriority,
40+ autoCompleteAfterXHours: 24
41+ ) {
42+ stage('testsuite-clone') {
43+ reportActivity(name: 'testsuite-clone', executionId: params.executionId) {
44+ println "Cloning the ${params.TEST_SUITE_URL} repo, branch ${params.TEST_SUITE_BRANCH}"
45+ git branch: "${params.TEST_SUITE_BRANCH}", url: "${params.TEST_SUITE_URL}"
46+ }
47+ }
48+
49+ }
50+
51+ } finally {
52+ node (label: 'built-in') {
53+ cleanupWorkspace()
54+ }
55+ }
56+ }
57+
0 commit comments