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

Jump to bottom

kie-issues#423: 9.x: Remove build-chain patch #5460

Merged
merged 3 commits into from
Aug 17, 2023
Merged

kie-issues#423: 9.x: Remove build-chain patch #5460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8b35b2
kie-issues#423: 9.x: Remove build-chain patch
radtriste Aug 14, 2023
8e17125
update
radtriste Aug 16, 2023
df6ab9a
update
radtriste Aug 16, 2023
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
302 changes: 0 additions & 302 deletions .ci/environments/quarkus-3/patches/1000_ci_updates.patch
View file
Open in desktop

This file was deleted.

21 changes: 15 additions & 6 deletions .ci/jenkins/Jenkinsfile.deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pipeline {
dir(getRepoName()) {
if (githubscm.isBranchExist('origin',getPRBranch())) {
githubscm.removeRemoteBranch('origin', getPRBranch())
}
}
githubscm.createBranch(getPRBranch())
}
}
Expand All @@ -103,7 +103,12 @@ pipeline {
stage('Build & Test') {
steps {
script {
getMavenCommand().withProperty('maven.test.failure.ignore', true).skipTests(params.SKIP_TESTS).run('clean install')
getMavenCommand()
.withOptions(env.DROOLS_BUILD_MVN_OPTS ? [ env.DROOLS_BUILD_MVN_OPTS ] : [])
.withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
.withProperty('maven.test.failure.ignore', true)
.skipTests(params.SKIP_TESTS)
.run('clean install')
}
}
post {
Expand Down Expand Up @@ -261,8 +266,9 @@ MavenCommand getMavenCommand(String directory = '') {
directory = directory ?: getRepoName()
def mvnCmd = new MavenCommand(this, ['-fae', '-ntp'])
.withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
.withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : [])
.inDirectory(directory)
if (!isStream8()) { // Workaround as enforcer rules may not be fixed on other streams
if (!isMainStream()) { // Workaround as enforcer rules may not be fixed on other streams
mvnCmd.withProperty('enforcer.skip')
} else {
mvnCmd.withProperty('full')
Expand All @@ -279,7 +285,10 @@ void runMavenDeploy(boolean localDeployment = false) {
mvnCmd.withDeployRepository(env.MAVEN_DEPLOY_REPOSITORY)
}

mvnCmd.skipTests(true).run('clean deploy')
mvnCmd.skipTests(true)
.withOptions(env.DROOLS_BUILD_MVN_OPTS ? [ env.DROOLS_BUILD_MVN_OPTS ] : [])
.withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
.run('clean deploy')
}

void runMavenStage() {
Expand All @@ -298,6 +307,6 @@ String getLocalDeploymentFolder() {
return "${env.MAVEN_DEPLOY_LOCAL_DIR}/${getRepoName()}"
}

boolean isStream8() {
return env.DROOLS_STREAM == '8'
boolean isMainStream() {
return env.DROOLS_STREAM == 'main'
}
15 changes: 11 additions & 4 deletions .ci/jenkins/Jenkinsfile.promote
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,17 @@ pipeline {

stage('Upload drools binaries and documentation') {
when {
expression { return isStream8() }
expression { return isMainStream() }
}
steps {
script {
getMavenCommand().inDirectory(getRepoName()).skipTests(true).withProperty('full').run('clean install')
getMavenCommand()
.withOptions(env.DROOLS_BUILD_MVN_OPTS ? [ env.DROOLS_BUILD_MVN_OPTS ] : [])
.withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
.inDirectory(getRepoName())
.skipTests(true)
.withProperty('full')
.run('clean install')
uploadFileMgmt(getRepoName())
}
}
Expand Down Expand Up @@ -195,6 +201,7 @@ void tagLatest() {
MavenCommand getMavenCommand() {
mvnCmd = new MavenCommand(this, ['-fae', '-ntp'])
.withSettingsXmlId("${env.MAVEN_SETTINGS_CONFIG_FILE_ID}")
.withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : [])
if (env.MAVEN_DEPENDENCIES_REPOSITORY) {
mvnCmd.withDependencyRepositoryInSettings('deps-repo', env.MAVEN_DEPENDENCIES_REPOSITORY)
}
Expand All @@ -218,6 +225,6 @@ boolean isNotTestingBuild() {
return getGitAuthor() == 'kiegroup'
}

boolean isStream8() {
return env.DROOLS_STREAM == '8'
boolean isMainStream() {
return env.DROOLS_STREAM == 'main'
}
Loading
Loading