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

KOGITO-5386: added a new parameter for unique branch name #3161

Merged
merged 1 commit into from
Aug 8, 2023
Merged

KOGITO-5386: added a new parameter for unique branch name #3161

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
5 changes: 4 additions & 1 deletion .ci/jenkins/Jenkinsfile.deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ pipeline {
steps {
script {
dir(getRepoName()) {
if (githubscm.isBranchExist('origin',getPRBranch())) {
githubscm.removeRemoteBranch('origin', getPRBranch())
}
githubscm.createBranch(getPRBranch())
}
}
Expand Down Expand Up @@ -274,7 +277,7 @@ String getDroolsVersion() {
}

String getPRBranch() {
return "${getProjectVersion()}-${env.PR_BRANCH_HASH}"
return params.KOGITO_PR_BRANCH
}

void setDeployPropertyIfNeeded(String key, def value) {
Expand Down
3 changes: 2 additions & 1 deletion .ci/jenkins/dsl/jobs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void setupDeployJob(JobType jobType, String envName = '') {

AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",

MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_URL}",
MAVEN_REPO_CREDS_ID: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_CREDS_ID}",
Expand Down Expand Up @@ -212,6 +212,7 @@ void setupDeployJob(JobType jobType, String envName = '') {
booleanParam('CREATE_PR', false, 'Should we create a PR with the changes ?')
stringParam('PROJECT_VERSION', '', 'Set the project version')
stringParam('DROOLS_VERSION', '', 'Drools version to set')
stringParam('KOGITO_PR_BRANCH', '', 'PR branch name')

booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
}
Expand Down
9 changes: 4 additions & 5 deletions .ci/jenkins/tests/src/test/vars/JenkinsfileDeploy.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class JenkinsfileDeploy extends JenkinsPipelineSpecification {
output == 'AUTHOR'
}

def '[Jenkinsfile.deploy] getBuildBranch()' () {
def '[Jenkinsfile.deploy] getBuildBranch' () {
setup:
Jenkinsfile.getBinding().setVariable('params', ['BUILD_BRANCH_NAME' : 'BRANCH'])
when:
Expand All @@ -53,14 +53,13 @@ class JenkinsfileDeploy extends JenkinsPipelineSpecification {
output == 'VERSION'
}

def '[Jenkinsfile.deploy] getPRBranch with version param' () {
def '[Jenkinsfile.deploy] getPRBranch with pr branch param' () {
setup:
Jenkinsfile.getBinding().setVariable('env', ['PR_BRANCH_HASH' : 'HASH'])
Jenkinsfile.getBinding().setVariable('params', ['PROJECT_VERSION' : 'VERSION'])
Jenkinsfile.getBinding().setVariable('params', ['KOGITO_PR_BRANCH' : 'PR_BRANCH'])
when:
def output = Jenkinsfile.getPRBranch()
then:
output == 'VERSION-HASH'
output == 'PR_BRANCH'
}

}