From 980751d4e2d75b27479b34974a130c70be0626d0 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 5 Sep 2023 11:11:44 +0200 Subject: [PATCH] kie-issues#574 Initial ASF Jenkins CI Setup --- .ci/jenkins/Jenkinsfile.branch | 10 +++++----- .ci/jenkins/Jenkinsfile.bump-up-version | 11 +++++------ .ci/jenkins/dsl/jobs.groovy | 6 +++--- .ci/jenkins/dsl/test.sh | 8 ++++---- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.branch b/.ci/jenkins/Jenkinsfile.branch index a809edf0..f01076f8 100644 --- a/.ci/jenkins/Jenkinsfile.branch +++ b/.ci/jenkins/Jenkinsfile.branch @@ -3,11 +3,11 @@ import org.jenkinsci.plugins.workflow.libs.Library import org.kie.jenkins.MavenCommand import org.kie.jenkins.MavenStagingHelper -AGENT_LABEL="kie-rhel7 && kie-mem4g" -MVN_TOOL="kie-maven-3.8.1" -JDK_TOOL="kie-jdk11" -benchmarksRepo="kie-benchmarks" -GIT_AUTHOR="kiegroup" +AGENT_LABEL="ubuntu" +MVN_TOOL="maven_3.8.6" +JDK_TOOL="jdk_11_latest" +benchmarksRepo="incubator-kie-benchmarks" +GIT_AUTHOR="apache" TARGET_BRANCH="newBranch" pipeline { diff --git a/.ci/jenkins/Jenkinsfile.bump-up-version b/.ci/jenkins/Jenkinsfile.bump-up-version index 2e3fa100..9ebfa8db 100644 --- a/.ci/jenkins/Jenkinsfile.bump-up-version +++ b/.ci/jenkins/Jenkinsfile.bump-up-version @@ -3,15 +3,14 @@ import org.jenkinsci.plugins.workflow.libs.Library import org.kie.jenkins.MavenCommand -def repoName = 'kie-benchmarks' +def repoName = 'incubator-kie-benchmarks' pipeline { agent { - label 'rhel8 && !built-in' - } - tools { - maven env.BUILD_MAVEN_TOOL - jdk env.BUILD_JDK_TOOL + docker { + image env.AGENT_DOCKER_BUILDER_IMAGE + args env.AGENT_DOCKER_BUILDER_ARGS + } } environment { diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index c28a7525..95897990 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -2,10 +2,10 @@ * This file is describing all the Jenkins jobs in the DSL format (see https://plugins.jenkins.io/job-dsl/) * needed by the Kogito pipelines. * -* The main part of Jenkins job generation is defined into the https://github.com/kiegroup/kogito-pipelines repository. +* The main part of Jenkins job generation is defined into the https://github.com/apache/incubator-kie-kogito-pipelines repository. * * This file is making use of shared libraries defined in -* https://github.com/kiegroup/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl. +* https://github.com/apache/incubator-kie-kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl. */ import org.kie.jenkins.jobdsl.model.JobType @@ -25,7 +25,7 @@ setupUpdateDependencyJob('drools') void setupUpdateDependencyJob(String updateRepoName) { def jobParams = JobParamsUtils.getBasicJobParams(this, "kie-benchmarks-update-${updateRepoName}", JobType.TOOLS, "${jenkins_path}/Jenkinsfile.bump-up-version", "${updateRepoName} bump up version") - JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) + JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams) jobParams.env.putAll([ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh index 054bc9b0..64d47847 100644 --- a/.ci/jenkins/dsl/test.sh +++ b/.ci/jenkins/dsl/test.sh @@ -22,13 +22,13 @@ fi git_author="$(echo ${git_url} | awk -F"${git_server_url}" '{print $2}' | awk -F. '{print $1}' | awk -F/ '{print $1}')" -export DSL_DEFAULT_MAIN_CONFIG_FILE_REPO="${git_author}"/drools -export DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO=kiegroup/drools +export DSL_DEFAULT_MAIN_CONFIG_FILE_REPO="${git_author}"/incubator-kie-drools +export DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO=apache/incubator-kie-drools export DSL_DEFAULT_MAIN_CONFIG_FILE_PATH=.ci/jenkins/config/main.yaml -export DSL_DEFAULT_BRANCH_CONFIG_FILE_REPO="${git_author}"/drools +export DSL_DEFAULT_BRANCH_CONFIG_FILE_REPO="${git_author}"/incubator-kie-drools file=$(mktemp) # For more usage of the script, use ./test.sh -h -curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh chmod u+x ${file} ${file} $@ \ No newline at end of file