Skip to content

Commit

Permalink
Update to Jenkins LTS 2.121.1 (#1763)
Browse files Browse the repository at this point in the history
* [JENKINS-52295] Update to Jenkins LTS 2.121.1

 - change to use jenkins/jenkins:lts base Docker image
 - use `docker run jenkins/jenkins:lts --version` to obtain effective version
 - pom.xml continues to explicitly use effective version

* Other places to bump version / add another LTS acceptance test target
  • Loading branch information
delitescere authored and olamy committed Jul 1, 2018
1 parent 78543ab commit 5cffd53
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 10 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# You can build everything needed and this Dockerfile by invoking `bin/build-in-docker.sh -m`
#

# Should be kept in sync with jenkins.properties of pom.xml
# Effective version should be kept in sync with jenkins.properties of pom.xml
# Use `docker run jenkins/jenkins:lts --version` to obtain latest LTS version
# Patch version is not to be considered, we prefer to base the image off the latest LTS of the line
# and keep the dependency on the baseline in pom.xml
FROM jenkins:2.107.2
FROM jenkins/jenkins:lts

USER root

Expand Down
8 changes: 6 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ node() {
archive '*/target/jest-coverage/**/*'
}

stage('ATH - Jenkins 2.107.2') {
sh "cd acceptance-tests && ./run.sh -v=2.107.2 --no-selenium --settings='-s ${env.WORKSPACE}/settings.xml'"
stage('ATH - Jenkins 2.121.1') {
sh "cd acceptance-tests && ./run.sh -v=2.121.1 --no-selenium --settings='-s ${env.WORKSPACE}/settings.xml'"
junit 'acceptance-tests/target/surefire-reports/*.xml'
archive 'acceptance-tests/target/screenshots/**/*'
}
Expand All @@ -66,6 +66,10 @@ node() {
sh "cd acceptance-tests && ./run.sh -v=2.107.2 --no-selenium --settings='-s ${env.WORKSPACE}/settings.xml'"
junit 'acceptance-tests/target/surefire-reports/*.xml'
}
stage('ATH - Jenkins 2.121.1') {
sh "cd acceptance-tests && ./run.sh -v=2.121.1 --no-selenium --settings='-s ${env.WORKSPACE}/settings.xml'"
junit 'acceptance-tests/target/surefire-reports/*.xml'
}
}


Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ You can chat to folks on #jenkins-ux on freenode (IRC). You can also email the j

Advanced front end development with react, redux and stuff by @scherler: https://docs.google.com/presentation/d/1dbaYTIGjGT9xX1JnWnaqjMumq94M9nGwljfMQaVtUFc/edit?usp=sharing

Watch @i386 and @jenkinsci on Twitter for frequent updates and news.
Watch @jenkinsci on Twitter for frequent updates and news.

## Upgrading dependencies

Expand All @@ -239,7 +239,7 @@ If you wanted to see if a new version of a library works with blue ocean:
* If it isn't published yet, release a beta to the experimental update center
* Open a pull request with the changes to the `pom.xml` in the root of this project (beta dependencies are fine)
* Mark the pull request as "needs-review"
* Make sure to "@mention" people - @i386, @vivek are some good ones to start with in a pull request description
* Make sure to "@mention" people - @michaelneale @vivek are some good ones to start with in a pull request description
* IF the dependency being upgraded is only released to the experimental update center (ie a beta) please also mark the PR as 'DO NOT MERGE' (once it has been released to the main update center, this can be removed)
* Check back later for build success (ie unit tests)
* The Acceptance Test Harness will normally be automatically triggered after a successful PR build, however, it ie best to check it has run: (https://ci.blueocean.io/job/ATH-Jenkinsfile/job/master/) - consult a blue ocean contributor (see below) and they will ensure it has run. This is required for a dependency change.
Expand All @@ -253,7 +253,7 @@ Contacting contributors:

Gitter is the day to day chat venue used, you can log in with your github identity.

* look for @michaelneale, @kzantow, @vivek or @i386 on gitter https://gitter.im/jenkinsci/blueocean-plugin or #jenkins-ux on freenode
* look for @michaelneale, @kzantow, @vivek on gitter https://gitter.im/jenkinsci/blueocean-plugin or #jenkins-ux on freenode
* Post to the mailing list: https://groups.google.com/forum/#!forum/jenkinsci-ux


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</pluginRepository>
</pluginRepositories>
<properties>
<jenkins.version>2.107.2</jenkins.version>
<jenkins.version>2.121.1</jenkins.version>
<jenkins-test-harness.version>2.30</jenkins-test-harness.version>
<java.level>8</java.level>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion acceptance-tests/runner/scripts/args.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
JENKINS_VERSION=2.107.2
JENKINS_VERSION=2.121.1
SELENIUM_VERSION=2.53

MAVEN_SETTINGS=""
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<properties>
<java.level>8</java.level>
<jenkins.version>2.107.2</jenkins.version> <!-- Should be kept in sync with Dockerfile FROM statement-->
<jenkins.version>2.121.1</jenkins.version> <!-- Should be kept in sync with the version resulting from Dockerfile FROM statement-->
<javadoc.exec.goal>javadoc-no-fork</javadoc.exec.goal> <!-- stop initialize phase plugins executing twice -->
<frontend-version>1.6</frontend-version>
<node.version>6.4.0</node.version>
Expand Down

0 comments on commit 5cffd53

Please sign in to comment.