@@ -7,19 +7,17 @@ import org.kie.jenkins.MavenStagingHelper
7
7
8
8
deployProperties = [:]
9
9
10
- optaplannerRepository = 'optaplanner'
11
- quickstartsRepository = 'optaplanner-quickstarts'
10
+ optaplannerRepository = 'incubator-kie- optaplanner'
11
+ quickstartsRepository = 'incubator-kie- optaplanner-quickstarts'
12
12
13
13
imageUtils = null
14
14
15
15
pipeline {
16
16
agent {
17
- label 'kie-rhel8 && docker && kie-mem16g && !built-in'
18
- }
19
-
20
- tools {
21
- maven env.BUILD_MAVEN_TOOL
22
- jdk env.BUILD_JDK_TOOL
17
+ docker {
18
+ image env.AGENT_DOCKER_BUILDER_IMAGE
19
+ args env.AGENT_DOCKER_BUILDER_ARGS
20
+ }
23
21
}
24
22
25
23
options {
@@ -28,21 +26,13 @@ pipeline {
28
26
disableConcurrentBuilds(abortPrevious: true)
29
27
}
30
28
31
- // parameters {
32
- // For parameters, check into .jenkins/dsl/jobs.groovy file
33
- // }
34
-
35
29
environment {
36
- // Some generated env is also defined into .jenkins/dsl/jobs.groovy file
37
-
38
30
OPTAPLANNER_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
39
31
40
- MAVEN_OPTS = '-Xms1024m -Xmx4g'
41
-
42
32
PR_BRANCH_HASH = "${util.generateHash(10)}"
43
33
44
34
// Maven configuration
45
- MAVEN_DEPLOY_LOCAL_DIR = "${WORKSPACE} /maven_deploy_dir"
35
+ MAVEN_DEPLOY_LOCAL_DIR = "/tmp /maven_deploy_dir"
46
36
}
47
37
48
38
stages {
@@ -197,9 +187,6 @@ pipeline {
197
187
when {
198
188
expression { return shouldStageArtifacts() }
199
189
}
200
- tools {
201
- jdk 'kie-jdk11'
202
- }
203
190
steps {
204
191
script {
205
192
// Stage release artifacts
@@ -320,7 +307,7 @@ void checkoutRepo(String repo, String dirName = repo) {
320
307
dir(dirName) {
321
308
deleteDir()
322
309
if (params.PR_TARGET_BRANCH) {
323
- githubscm.checkoutIfExists(repo, getGitAuthor(), getBuildBranch(), 'kiegroup ', getFallbackBranch(repo), true)
310
+ githubscm.checkoutIfExists(repo, getGitAuthor(), getBuildBranch(), 'apache ', getFallbackBranch(repo), true)
324
311
} else {
325
312
checkout(githubscm.resolveRepository(repo, getGitAuthor(), getBuildBranch(), false))
326
313
}
@@ -331,15 +318,15 @@ void checkoutQuickstarts(String dirName = quickstartsRepository) {
331
318
dir(dirName) {
332
319
deleteDir()
333
320
if (params.PR_TARGET_BRANCH) {
334
- githubscm.checkoutIfExists(quickstartsRepository, getGitAuthor(), getBuildBranch(), 'kiegroup ', getQuickStartsBranch(), true)
321
+ githubscm.checkoutIfExists(quickstartsRepository, getGitAuthor(), getBuildBranch(), 'apache ', getQuickStartsBranch(), true)
335
322
} else {
336
323
checkout(githubscm.resolveRepository(quickstartsRepository, getGitAuthor(), getQuickStartsBranch(), false))
337
324
}
338
325
}
339
326
}
340
327
341
328
String getFallbackBranch(String repo) {
342
- def repositoryScm = githubscm.getRepositoryScm(repo, 'kiegroup ', params.PR_TARGET_BRANCH)
329
+ def repositoryScm = githubscm.getRepositoryScm(repo, 'apache ', params.PR_TARGET_BRANCH)
343
330
return repositoryScm ? params.PR_TARGET_BRANCH : 'main'
344
331
}
345
332
@@ -452,7 +439,7 @@ boolean shouldDeployToRepository() {
452
439
}
453
440
454
441
boolean isNotTestingBuild() {
455
- return getGitAuthor() == 'kiegroup '
442
+ return getGitAuthor() == 'apache '
456
443
}
457
444
458
445
boolean isRelease() {
0 commit comments