This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-pipelines.git
The following commit(s) were added to refs/heads/main by this push:
new 6b54585d kie-issues#1255: agent docker config in main pipeline (#1205)
6b54585d is described below
commit 6b54585d8129a262ea140730772df53868488bd3
Author: Jan Stastny <[email protected]>
AuthorDate: Fri May 24 09:19:09 2024 +0200
kie-issues#1255: agent docker config in main pipeline (#1205)
Co-authored-by: jstastny-cz <[email protected]>
---
.ci/jenkins/config/main.yaml | 8 ++++++++
dsl/seed/jenkinsfiles/Jenkinsfile.seed.main | 6 ++++++
dsl/seed/jobs/root_jobs.groovy | 9 ++++++---
dsl/seed/jobs/seed_job_branch.groovy | 4 ++--
.../src/test/groovy/org/kie/jenkins/jobdsl/JobScriptsSpec.groovy | 2 ++
5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml
index c4e240ec..373eea86 100644
--- a/.ci/jenkins/config/main.yaml
+++ b/.ci/jenkins/config/main.yaml
@@ -31,3 +31,11 @@ seed:
jenkinsfile: dsl/seed/jenkinsfiles/Jenkinsfile.seed.branch
jenkins:
email_creds_id: KOGITO_CI_NOTIFICATION_EMAILS
+ agent:
+ docker:
+ builder:
+ # At some point, this image will need to be changed when a release
branch is created
+ # but we need to make sure the image exists first ... simple tag
before setting up the branch ?
+ # See https://github.com/kiegroup/kie-issues/issues/551
+ image: quay.io/kiegroup/kogito-ci-build:main-latest
+ args: --privileged --group-add docker
diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.seed.main
b/dsl/seed/jenkinsfiles/Jenkinsfile.seed.main
index deaeaf82..b5a02f2e 100644
--- a/dsl/seed/jenkinsfiles/Jenkinsfile.seed.main
+++ b/dsl/seed/jenkinsfiles/Jenkinsfile.seed.main
@@ -58,6 +58,8 @@ pipeline {
SEED_CONFIG_FILE_GIT_AUTHOR_PUSH_CREDS_ID:
readSeedConfig().seed.config_file.git.author.push.credentials_id,
SEED_CONFIG_FILE_GIT_BRANCH:
"${SEED_CONFIG_FILE_GIT_BRANCH}",
SEED_CONFIG_FILE_PATH: "${SEED_CONFIG_FILE_PATH}",
+ JENKINS_AGENT_DOCKER_BUILDER_IMAGE:
readSeedConfig().jenkins.agent.docker.builder.image,
+ JENKINS_AGENT_DOCKER_BUILDER_ARGS:
readSeedConfig().jenkins.agent.docker.builder.args,
ALL_BRANCHES: readSeedConfig().git.branches.collect {
it.name }.join(','),
MAIN_BRANCH_NAME: readSeedConfig().git.branches.find {
it.main_branch }?.name,
]
@@ -104,6 +106,8 @@ pipeline {
SEED_CONFIG_FILE_GIT_AUTHOR_PUSH_CREDS_ID:
branchConfigFileInfo.push_credentials,
SEED_CONFIG_FILE_GIT_BRANCH:
branchConfigFileInfo.branch,
SEED_CONFIG_FILE_PATH:
branchConfigFileInfo.filepath,
+ JENKINS_AGENT_DOCKER_BUILDER_IMAGE:
readSeedConfig().jenkins.agent.docker.builder.image,
+ JENKINS_AGENT_DOCKER_BUILDER_ARGS:
readSeedConfig().jenkins.agent.docker.builder.args,
]
echo 'Got envProperties for generation'
echo "${envProperties}"
@@ -138,6 +142,8 @@ pipeline {
SEED_CONFIG_FILE_GIT_BRANCH:
"${SEED_CONFIG_FILE_GIT_BRANCH}",
SEED_CONFIG_FILE_PATH: "${SEED_CONFIG_FILE_PATH}",
JENKINS_EMAIL_CREDS_ID:
readSeedConfig().jenkins.email_creds_id,
+ JENKINS_AGENT_DOCKER_BUILDER_IMAGE:
readSeedConfig().jenkins.agent.docker.builder.image,
+ JENKINS_AGENT_DOCKER_BUILDER_ARGS:
readSeedConfig().jenkins.agent.docker.builder.args,
]
dir(scriptUtils.getDslSeedFolderAbsolutePath()) {
println "[INFO] Generate main seed job with properties
${envProperties}"
diff --git a/dsl/seed/jobs/root_jobs.groovy b/dsl/seed/jobs/root_jobs.groovy
index 7565ee1a..64e159bc 100644
--- a/dsl/seed/jobs/root_jobs.groovy
+++ b/dsl/seed/jobs/root_jobs.groovy
@@ -19,7 +19,6 @@
// +++++++++++++++++++++++++++++++++++++++++++ root jobs
++++++++++++++++++++++++++++++++++++++++++++++++++++
-import org.kie.jenkins.jobdsl.utils.JobParamsUtils
import org.kie.jenkins.jobdsl.KogitoConstants
import org.kie.jenkins.jobdsl.KogitoJobTemplate
import org.kie.jenkins.jobdsl.Utils
@@ -38,7 +37,6 @@ def jobParams = [
env: [:],
jenkinsfile: 'dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare',
]
-JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -68,6 +66,9 @@ KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
env('SEED_BRANCH', Utils.getSeedBranch(this))
env('SEED_CREDENTIALS_ID', Utils.getSeedAuthorCredsId(this))
env('SEED_PUSH_CREDENTIALS_ID', Utils.getSeedAuthorPushCredsId(this))
+
+ env('AGENT_DOCKER_BUILDER_IMAGE',
Utils.getJenkinsAgentDockerImage(this, 'builder'))
+ env('AGENT_DOCKER_BUILDER_ARGS',
Utils.getJenkinsAgentDockerArgs(this, 'builder'))
}
}
@@ -85,7 +86,6 @@ def jobParamsRemove = [
env: [:],
jenkinsfile: 'dsl/seed/jenkinsfiles/Jenkinsfile.remove.branches',
]
-JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParamsRemove)
List nonMainBranches = ALL_BRANCHES.split(',').findAll { it !=
MAIN_BRANCH_NAME }
if (nonMainBranches) {
@@ -103,6 +103,9 @@ if (nonMainBranches) {
env('GIT_AUTHOR_PUSH_CREDENTIALS_ID',
"${SEED_CONFIG_FILE_GIT_AUTHOR_PUSH_CREDS_ID}")
env('GIT_BRANCH_TO_BUILD', "${SEED_CONFIG_FILE_GIT_BRANCH}")
env('CONFIG_FILE_PATH', "${SEED_CONFIG_FILE_PATH}")
+
+ env('AGENT_DOCKER_BUILDER_IMAGE',
Utils.getJenkinsAgentDockerImage(this, 'builder'))
+ env('AGENT_DOCKER_BUILDER_ARGS',
Utils.getJenkinsAgentDockerArgs(this, 'builder'))
}
}
} else {
diff --git a/dsl/seed/jobs/seed_job_branch.groovy
b/dsl/seed/jobs/seed_job_branch.groovy
index 971ebcb2..1ba4e6ef 100644
--- a/dsl/seed/jobs/seed_job_branch.groovy
+++ b/dsl/seed/jobs/seed_job_branch.groovy
@@ -150,8 +150,8 @@
pipelineJob("${GENERATION_BRANCH}/tools/toggle-dsl-triggers") {
env('JENKINS_EMAIL_CREDS_ID', Utils.getJenkinsEmailCredsId(this))
- env('AGENT_DOCKER_BUILDER_IMAGE',
Utils.getJenkinsAgentDockerImage(script, 'builder'))
- env('AGENT_DOCKER_BUILDER_ARGS',
Utils.getJenkinsAgentDockerArgs(script, 'builder'))
+ env('AGENT_DOCKER_BUILDER_IMAGE',
Utils.getJenkinsAgentDockerImage(this, 'builder'))
+ env('AGENT_DOCKER_BUILDER_ARGS',
Utils.getJenkinsAgentDockerArgs(this, 'builder'))
}
definition {
diff --git
a/dsl/seed/src/test/groovy/org/kie/jenkins/jobdsl/JobScriptsSpec.groovy
b/dsl/seed/src/test/groovy/org/kie/jenkins/jobdsl/JobScriptsSpec.groovy
index 96ae44ae..90d3eb9a 100644
--- a/dsl/seed/src/test/groovy/org/kie/jenkins/jobdsl/JobScriptsSpec.groovy
+++ b/dsl/seed/src/test/groovy/org/kie/jenkins/jobdsl/JobScriptsSpec.groovy
@@ -83,6 +83,8 @@ class JobScriptsSpec extends Specification {
envVars.put('SEED_CONFIG_FILE_GIT_AUTHOR_PUSH_CREDS_ID',
'SEED_CONFIG_FILE_GIT_AUTHOR_PUSH_CREDS_ID')
envVars.put('SEED_CONFIG_FILE_GIT_BRANCH',
'SEED_CONFIG_FILE_GIT_BRANCH')
envVars.put('SEED_CONFIG_FILE_PATH', 'SEED_CONFIG_FILE_PATH')
+ envVars.put('JENKINS_AGENT_DOCKER_BUILDER_IMAGE',
'JENKINS_AGENT_DOCKER_BUILDER_IMAGE')
+ envVars.put('JENKINS_AGENT_DOCKER_BUILDER_ARGS',
'JENKINS_AGENT_DOCKER_BUILDER_ARGS')
envVars.put('GIT_JENKINS_CONFIG_PATH', 'GIT_JENKINS_CONFIG_PATH')
JobManagement jm = new JenkinsJobManagement(System.out, envVars, new
File('.'))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
