Skip to content

Use stable branch for release #2123

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

Merged
merged 2 commits into from
Sep 14, 2021
Merged

Use stable branch for release #2123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceea4d8
[CI][release] Use stable as default branch
v1v Sep 14, 2021
1556e9e
stable branch does not require to validate the test results
v1v Sep 14, 2021
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
29 changes: 17 additions & 12 deletions .ci/release/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pipeline {
PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
SLACK_CHANNEL = '#apm-agent-java'
NOTIFY_TO = 'build-apm+apm-agent-java@elastic.co'
BRANCH_SPECIFIER = "${params.branch_specifier}"
}
options {
timeout(time: 3, unit: 'HOURS')
Expand All @@ -25,10 +26,9 @@ pipeline {

}
parameters {
string(name: 'branch_specifier', defaultValue: 'master')
booleanParam(name: 'check_branch_ci_status', defaultValue: true, description: "Check for failing tests in the master branch?")
string(name: 'branch_specifier', defaultValue: 'stable', description: "What branch to release from?")
booleanParam(name: 'check_branch_ci_status', defaultValue: true, description: "Check for failing tests in the given branch (if no stable branch)?")
}

stages {
stage('Initializing'){
options { skipDefaultCheckout() }
Expand All @@ -37,7 +37,7 @@ pipeline {
steps {
gitCheckout(
basedir: "${BASE_DIR}",
branch: 'master',
branch: "${BRANCH_SPECIFIER}",
repo: 'git@github.com:elastic/apm-agent-java.git',
credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba',
shallow: false
Expand Down Expand Up @@ -84,14 +84,19 @@ pipeline {
}
}
}
stage('Check master build status') {
when { expression { params.check_branch_ci_status } }
steps {
// If this build is not green: https://apm-ci.elastic.co/job/apm-agent-java/job/apm-agent-java-mbp/job/master/
whenTrue(!buildStatus(host: 'apm-ci.elastic.co', job: ['apm-agent-java', 'apm-agent-java-mbp', 'master'], return_boolean: true)) {
input(message: "WARNING! The master build is not passing. Do you wish to continue?")
}
}
stage('Check build status') {
when {
allOf {
expression { params.check_branch_ci_status }
not { branch 'stable' }
}
Comment on lines +89 to +92
Copy link
Member Author

@v1v v1v Sep 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need to validate the stable. Besides, stable builds don't exist as a Jenkins Multibranch Pipeline since they are filtered in

apm-agent-java/.ci/jobs/apm-agent-java-mbp.yml

Line 16 in c203cd1

head-filter-regex: '^(?!stable).*$'

}
steps {
// If this build is not green: https://apm-ci.elastic.co/job/apm-agent-java/job/apm-agent-java-mbp/job/"${BRANCH_SPECIFIER}"/
whenTrue(!buildStatus(host: 'apm-ci.elastic.co', job: ['apm-agent-java', 'apm-agent-java-mbp', "${BRANCH_SPECIFIER}"], return_boolean: true)) {
input(message: "WARNING! The ${BRANCH_SPECIFIER} build is not passing. Do you wish to continue?")
}
}
}
stage('Require confirmation that CHANGELOG.asciidoc has been updated') {
steps {
Expand Down