Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kie-issues#1255: fix jobs needing gh CLI #1203

Merged
merged 1 commit into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .ci/jenkins/Jenkinsfile.tools.update-jenkins-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ branchCreated = false

pipeline {
agent {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
label util.avoidFaultyNodes('ubuntu')
}

Expand Down
1 change: 1 addition & 0 deletions .ci/jenkins/dsl/jobs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ void setupUpdateJenkinsDependenciesJob() {
GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
])
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
KogitoJobTemplate.createPipelineJob(this, jobParams)
}

Expand Down
2 changes: 2 additions & 0 deletions dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ repositoriesToBranch = []

pipeline {
agent {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
label util.avoidFaultyNodes('ubuntu')
}

Expand Down
2 changes: 2 additions & 0 deletions dsl/seed/jenkinsfiles/Jenkinsfile.remove.branches
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import org.kie.jenkins.MavenCommand
pipeline {

agent {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
label util.avoidFaultyNodes('ubuntu')
}

Expand Down
2 changes: 2 additions & 0 deletions dsl/seed/jenkinsfiles/Jenkinsfile.tools.toggle-triggers
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import org.kie.jenkins.MavenCommand

pipeline {
agent {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
label util.avoidFaultyNodes('ubuntu')
}

Expand Down
2 changes: 2 additions & 0 deletions dsl/seed/jenkinsfiles/Jenkinsfile.update-quarkus-version
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ failingRepos = []

pipeline {
agent {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
label util.avoidFaultyNodes('ubuntu')
}

Expand Down
2 changes: 2 additions & 0 deletions dsl/seed/jobs/root_jobs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def jobParams = [
env: [:],
jenkinsfile: 'dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare',
]
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)

KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
Expand Down Expand Up @@ -83,6 +84,7 @@ 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) {
Expand Down
3 changes: 3 additions & 0 deletions dsl/seed/jobs/seed_job_branch.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ pipelineJob("${GENERATION_BRANCH}/tools/toggle-dsl-triggers") {
env('SEED_CONFIG_FILE_PATH', "${SEED_CONFIG_FILE_PATH}")

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'))
}

definition {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ class KogitoJobUtils {
SEED_CONFIG_FILE_GIT_BRANCH: Utils.getBindingValue(script, 'SEED_CONFIG_FILE_GIT_BRANCH'),
SEED_CONFIG_FILE_PATH: Utils.getBindingValue(script, 'SEED_CONFIG_FILE_PATH'),
])
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(script, jobParams)
JobParamsUtils.setupJobParamsSeedRepoEnv(script, jobParams)
def job = KogitoJobTemplate.createPipelineJob(script, jobParams)
job?.with {
Expand Down
Loading