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.

Sign up for GitHub

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

[BXMSPROD-2209]: switched build nodes to RHEL8 one #1569

Merged
merged 1 commit into from
Oct 2, 2024
Merged

[BXMSPROD-2209]: switched build nodes to RHEL8 one #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion job-dsls/jobs/kie/branch/daily_builds.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def MVN_TOOL=Constants.MAVEN_TOOL
def KIE_VERSION=Constants.KIE_PREFIX
def BASE_BRANCH=Constants.BRANCH
def GH_ORG_UNIT=Constants.GITHUB_ORG_UNIT
def AGENT_LABEL="rhos-01 && kie-rhel7-pipeline && kie-mem24g && !built-in"
def AGENT_LABEL="rhos-01 && kie-rhel8-pipeline && kie-mem24g && !built-in"
def JENKINSFILE_REPO = 'droolsjbpm-build-bootstrap'
def JENKINSFILE_PWD= 'kie-ci'
def JENKINSFILE_PATH = '.ci/jenkins/Jenkinsfile.daily'
Expand Down
24 changes: 12 additions & 12 deletions job-dsls/jobs/kie/branch/deploy_jobs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def final DEFAULTS = [
ghAuthKey : "kie-ci-user-key",
timeoutMins : 90,
buildHistory : 3,
label : "kie-rhel7 && kie-mem8g && !built-in",
label : "kie-rhel8 && kie-mem8g && !built-in",
mvnGoals : "-e -fae -B -Pwildfly clean deploy com.github.spotbugs:spotbugs-maven-plugin:spotbugs",
mvnProps: [
"full" : "true",
Expand All @@ -33,25 +33,25 @@ def final DEFAULTS = [
def final REPO_CONFIGS = [
"droolsjbpm-build-bootstrap": [
timeoutMins : 30,
label : "kie-rhel7 && kie-mem4g",
label : "kie-rhel8 && kie-mem4g",
downstreamRepos : ["kie-soup"]
],
"kie-soup" : [
label : "kie-rhel7 && kie-mem4g",
label : "kie-rhel8 && kie-mem4g",
downstreamRepos : ["appformer", "/KIE/7.x/deployedRepo/droolsjbpm-knowledge-7.x"]
],
"lienzo-core" : [
timeoutMins : 20,
label : "kie-rhel7 && kie-mem4g",
label : "kie-rhel8 && kie-mem4g",
downstreamRepos : ["lienzo-tests"]
],
"lienzo-tests" : [
timeoutMins : 20,
label : "kie-rhel7 && kie-mem4g",
label : "kie-rhel8 && kie-mem4g",
downstreamRepos : ["appformer"]
],
"appformer" : [
label : "kie-rhel7 && kie-mem16g",
label : "kie-rhel8 && kie-mem16g",
mvnProps : DEFAULTS["mvnProps"] + [
"gwt.compiler.localWorkers": "2"
],
Expand All @@ -75,32 +75,32 @@ def final REPO_CONFIGS = [
],
"kie-wb-common" : [
timeoutMins : 180,
label : "kie-rhel7 && kie-mem16g",
label : "kie-rhel8 && kie-mem16g",
downstreamRepos : ["drools-wb"]
],
"drools-wb" : [
label : "kie-rhel7 && kie-mem16g",
label : "kie-rhel8 && kie-mem16g",
downstreamRepos : ["jbpm-wb", "optaplanner-wb"]
],
"jbpm-work-items" : [
label : "kie-rhel7 && kie-mem4g",
label : "kie-rhel8 && kie-mem4g",
timeoutMins: 30,
downstreamRepos : ["jbpm-wb"]
],
"jbpm-wb" : [
label : "kie-rhel7 && kie-mem16g",
label : "kie-rhel8 && kie-mem16g",
mvnProps : DEFAULTS["mvnProps"] + [
"gwt.compiler.localWorkers": "1"
],
downstreamRepos : ["kie-wb-distributions"]
],
"optaplanner-wb" : [
label : "kie-rhel7 && kie-mem16g",
label : "kie-rhel8 && kie-mem16g",
downstreamRepos : ["kie-wb-distributions"]
],
"kie-wb-distributions" : [
timeoutMins : 120,
label : "kie-rhel7 && kie-mem16g",
label : "kie-rhel8 && kie-mem16g",
mvnGoals : DEFAULTS["mvnGoals"] + " -Pbusiness-central",
mvnProps : DEFAULTS["mvnProps"] + [
"gwt.compiler.localWorkers": "1",
Expand Down
2 changes: 1 addition & 1 deletion job-dsls/jobs/kie/branch/deploy_jobs_7_x.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def final DEFAULTS = [
branch : "7.x",
ghAuthKey : "kie-ci-user-key",
timeoutMins : 90,
label : "kie-rhel7 && kie-mem8g && !built-in",
label : "kie-rhel8 && kie-mem8g && !built-in",
javadk : Constants.JDK_TOOL,
mvnGoals : "-e -fae -B -Pwildfly clean deploy com.github.spotbugs:spotbugs-maven-plugin:spotbugs",
mvnProps: [
Expand Down
4 changes: 2 additions & 2 deletions job-dsls/jobs/kie/branch/errai_deploy.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import org.kie.jenkins.jobdsl.templates.ErraiDeployJob

// Job parameters values
projectName = "errai"
labelName = "kie-rhel7&&kie-mem16g"
labelName = "kie-rhel8&&kie-mem16g"
timeoutValue = 180
mavenGoals = "-B -e -fae -Dmaven.test.failure.ignore=true -Pintegration-test clean deploy -Derrai.codegen.details=true"
branchName = Constants.BRANCH
Expand All @@ -37,4 +37,4 @@ ErraiDeployJob.addDeployConfiguration(job = jobDefinition,
labelName = labelName,
timeoutValue = timeoutValue,
mavenGoals = mavenGoals
)
)
2 changes: 1 addition & 1 deletion job-dsls/jobs/kie/branch/errai_jdk8_pr.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def ghAuthTokenId = "kie-ci-token"
def javadk="kie-jdk1.8"
def mvnToolEnv=Constants.MAVEN_TOOL
def mvnGoals = "-B -e -fae -Dmaven.test.failure.ignore=true -Pintegration-test clean install -Derrai.codegen.details=true -Dapt-generators"
def labelName = "kie-rhel7 && kie-mem16g"
def labelName = "kie-rhel8 && kie-mem16g"


// Creation of folders where jobs are stored
Expand Down
2 changes: 1 addition & 1 deletion job-dsls/jobs/kie/branch/errai_pr.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def ghAuthTokenId = "kie-ci-token"
def javadk="kie-jdk11"
def mvnToolEnv=Constants.MAVEN_TOOL
def mvnGoals = "-B -e -fae -Dmaven.test.failure.ignore=true -Pintegration-test clean install -Derrai.codegen.details=true -Dapt-generators"
def labelName = "kie-rhel7 && kie-mem16g"
def labelName = "kie-rhel8 && kie-mem16g"


// Creation of folders where jobs are stored
Expand Down
4 changes: 2 additions & 2 deletions job-dsls/jobs/kie/branch/kie_jenkinsScripts_PR.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def organization=Constants.GITHUB_ORG_UNIT
def javadk=Constants.JDK_TOOL
def repo="kie-ci"
def ghAuthTokenId="kie-ci-token"
def labelName="kie-rhel7 && kie-mem4g && !built-in"
def labelName="kie-rhel8 && kie-mem4g && !built-in"

// +++++++++++++++++++++++++++++++++++++++++++ create a seed job ++++++++++++++++++++++++++++++++++++++++++++++++++++

Expand Down Expand Up @@ -185,4 +185,4 @@ job(jobName) {
shell(errorSh)
shell(kieJenkins_PR)
}
}
}
4 changes: 2 additions & 2 deletions job-dsls/jobs/kie/branch/prodProjects_downstream_production.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def final DEFAULTS = [
ghOrgUnit : "",
branch : Constants.BRANCH,
timeoutMins : 650,
label : "kie-rhel7 && kie-mem24g",
label : "kie-rhel8 && kie-mem24g",
ghAuthTokenId : "kie-ci-token",
ghJenkinsfilePwd : "kie-ci-user-key",
artifactsToArchive : []
Expand Down Expand Up @@ -148,4 +148,4 @@ for (repoConfig in REPO_CONFIGS) {
}
}
}
}
}
2 changes: 1 addition & 1 deletion job-dsls/jobs/kie/branch/sonarcloud_daily.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def final DEFAULTS = [
branch : Constants.BRANCH,
timeoutMins : 90,
ghAuthTokenId : "kie-ci-user-key",
label : "kie-rhel7 && kie-mem8g",
label : "kie-rhel8 && kie-mem8g",
upstreamMvnArgs : "-B -e -T1C -DskipTests -Dgwt.compiler.skip=true -Dgwt.skipCompilation=true -Denforcer.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true clean install",
mvnGoals : "-B -e -nsu -fae -Pwildfly -Prun-code-coverage clean install",
mvnProps : [
Expand Down
2 changes: 1 addition & 1 deletion job-dsls/jobs/kie/branch/springboot_pr_job.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def final CONFIG = [
branch : Constants.BRANCH,
timeoutMins : 120,
ghAuthTokenId : "kie-ci-token",
label : "kie-rhel7 && kie-mem8g",
label : "kie-rhel8 && kie-mem8g",
upstreamMvnArgs : "-B -e -T1C -s \$SETTINGS_XML_FILE -Dkie.maven.settings.custom=\$SETTINGS_XML_FILE -DskipTests -DskipTests -Dgwt.compiler.skip=true -Dgwt.skipCompilation=true -Denforcer.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Drevapi.skip=true clean install",
mvnGoals : "-B -e -nsu -fae clean install -Pspringboot",
ITTestsParent : "kie-server-parent/kie-server-tests",
Expand Down
6 changes: 3 additions & 3 deletions ...in/groovy/org/kie/jenkins/jobdsl/templates/additionalTests/JbpmContainerTestMatrix.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ class JbpmContainerTestMatrix {
stringParam("settingsXml","${settingsXml}","settings.xml for this job depending of daily builds or release")
}

label('kie-rhel7 && !built-in')
label('kie-rhel8 && !built-in')

axes {
labelExpression("label-exp","kie-rhel7 && !built-in")
labelExpression("label-exp","kie-rhel8 && !built-in")
jdk("${jdkVersion}")
text("container", "tomcat9", "wildfly")
}
Expand Down Expand Up @@ -110,4 +110,4 @@ class JbpmContainerTestMatrix {
}
}
}
}
}
4 changes: 2 additions & 2 deletions ...ain/groovy/org/kie/jenkins/jobdsl/templates/additionalTests/JbpmTestCoverageMatrix.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ class JbpmTestCoverageMatrix {
stringParam("settingsXml","${settingsXml}","settings.xml for this job depending of daily builds or release")
}

label('kie-rhel7 && !built-in')
label('kie-rhel8 && !built-in')

axes {
labelExpression("label-exp", "kie-rhel7 && !built-in")
labelExpression("label-exp", "kie-rhel8 && !built-in")
jdk("${jdkVersion}")
}

Expand Down
4 changes: 2 additions & 2 deletions ...s/src/main/groovy/org/kie/jenkins/jobdsl/templates/additionalTests/KieServerMatrix.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ class KieServerMatrix {
stringParam("settingsXml","${settingsXml}","settings.xml for this job depending of daily builds or release")
}

label('kie-rhel7 && !built-in')
label('kie-rhel8 && !built-in')

axes {
labelExpression("label-exp","kie-rhel7 && !built-in")
labelExpression("label-exp","kie-rhel8 && !built-in")
jdk("${jdkVersion}")
text("container", "wildfly", "eap7", "tomcat9")
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/src/main/groovy/org/kie/jenkins/jobdsl/templates/additionalTests/KieWbTestMatrix.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ class KieWbTestMatrix {
stringParam("settingsXml","${settingsXml}","settings.xml for this job depending of daily builds or release")
}

label('kie-rhel7 && !built-in')
label('kie-rhel8 && !built-in')

axes {
labelExpression("label_exp", "kie-rhel7 && gui-testing && !built-in")
labelExpression("label_exp", "kie-rhel8 && gui-testing && !built-in")
text("container", "wildfly")
text("war", "business-central")
jdk("${jdkVersion}")
Expand Down
Loading