summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2016-07-30 23:56:03 +0300
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2016-07-30 20:59:39 +0000
commit29553b272494e2386fb0c921fa0bc8f2e93b1865 (patch)
tree48d91b5600811b92bb4829f7e7e94a026ea18979 /per-service
parent0b74751b1f623e69763c04337e2de6654c7147d7 (diff)
downloadansible-playbooks-29553b272494e2386fb0c921fa0bc8f2e93b1865.tar.gz
jenkins: Upgrade to 2.7.1 LTS.
Actual upgrade was done manually, as there were /etc/defaults/jenkins changes to clean up. These changes just bring the playbook in the corresponds with the actual state. Change-Id: I20a619c64ba6731dfe5f975a9b808fc1d35749d7 Reviewed-on: https://review.linaro.org/13536 Reviewed-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/jenkins/jenkins.yml2
-rw-r--r--per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/per-service/jenkins/jenkins.yml b/per-service/jenkins/jenkins.yml
index 4387f4f..eb8a077 100644
--- a/per-service/jenkins/jenkins.yml
+++ b/per-service/jenkins/jenkins.yml
@@ -5,7 +5,7 @@
vars:
- linaro_android_build_tools_repo: http://git.linaro.org/git/infrastructure/linaro-android-build-tools.git
- linaro_android_build_tools_rev: HEAD
- - jenkins_version: 1.651.1
+ - jenkins_version: 2.7.1
- jenkins_extra_users: files/jenkins_users.xml
vars_files:
# Include private settings only if they exist - not all modes need
diff --git a/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml b/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml
index 4d184d1..156271d 100644
--- a/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml
+++ b/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml
@@ -41,7 +41,7 @@
- name: Configure Jenkins startup parameters
lineinfile: regexp='^JENKINS_ARGS=.+'
- line='JENKINS_ARGS="--webroot=/var/cache/jenkins/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT --prefix={{jenkins_prefix}} --sessionTimeout=480"'
+ line='JENKINS_ARGS="--webroot=/var/cache/jenkins/war --httpPort=$HTTP_PORT --prefix={{jenkins_prefix}} --sessionTimeout=480"'
dest=/etc/default/jenkins backup=yes
- name: Set Java properties required to tweak Jenkins behavior