summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorBen Copeland <ben.copeland@linaro.org>2016-02-22 17:26:52 +0000
committerBen Copeland <ben.copeland@linaro.org>2016-02-23 10:47:53 +0000
commitb5ba4c44f80237236aff414190ded933d63da30f (patch)
tree706f0a80bb8010c4c789b60d62b7b73d30933bda /per-service
parent5275872e99e68933c8334704d471745a238f1723 (diff)
downloadansible-playbooks-b5ba4c44f80237236aff414190ded933d63da30f.tar.gz
jenkins: update the jenkins role to use become
sudo is deprecated. This commit updates our jenkins playbook to use the new become method. Change-Id: I5779d82b1ca90bfbe275e3b5237a0a7b49b9b35e Reviewed-on: https://review.linaro.org/10606 Reviewed-by: Andy Doan <andy.doan+gerrit@linaro.org> Reviewed-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/jenkins/jenkins-ec2-dirs.yml6
-rw-r--r--per-service/jenkins/jenkins.yml4
-rw-r--r--per-service/jenkins/roles/apache/tasks/main.yml2
-rw-r--r--per-service/jenkins/roles/common/handlers/main.yml2
-rw-r--r--per-service/jenkins/roles/common/tasks/main.yml2
-rw-r--r--per-service/jenkins/roles/dput-config/tasks/main.yml1
-rw-r--r--per-service/jenkins/roles/frontend/tasks/main.yml18
-rw-r--r--per-service/jenkins/roles/jenkins-cli/tasks/main.yml1
-rw-r--r--per-service/jenkins/roles/jenkins-config-git/tasks/main.yml1
-rw-r--r--per-service/jenkins/roles/jenkins-config-skeleton/handlers/main.yml1
-rw-r--r--per-service/jenkins/roles/jenkins-config-skeleton/tasks/main.yml8
-rw-r--r--per-service/jenkins/roles/jenkins-cronjobs/tasks/main.yml1
-rw-r--r--per-service/jenkins/roles/jenkins-linaro-theme/tasks/main.yml2
-rw-r--r--per-service/jenkins/roles/jenkins-ssh-publish/tasks/main.yml3
-rw-r--r--per-service/jenkins/roles/jenkins-user/tasks/main.yml2
-rw-r--r--per-service/jenkins/roles/jenkins-utils-set-jenkins-url/tasks/main.yml1
-rw-r--r--per-service/jenkins/roles/jenkins/handlers/main.yml1
-rw-r--r--per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml6
-rw-r--r--per-service/jenkins/roles/jenkins/tasks/jenkins-plugins.yml4
-rw-r--r--per-service/jenkins/roles/linaro-jenkins-tools/tasks/main.yml2
-rw-r--r--per-service/jenkins/roles/reposeed/tasks/main.yml2
-rw-r--r--per-service/jenkins/roles/squid/tasks/main.yml2
22 files changed, 4 insertions, 68 deletions
diff --git a/per-service/jenkins/jenkins-ec2-dirs.yml b/per-service/jenkins/jenkins-ec2-dirs.yml
index 623df0b..0e8c2e1 100644
--- a/per-service/jenkins/jenkins-ec2-dirs.yml
+++ b/per-service/jenkins/jenkins-ec2-dirs.yml
@@ -2,20 +2,16 @@
---
- hosts: production:&ec2
gather_facts: no
+ become: yes
tasks:
- name: Prepare jobs volume mount point
file: state=directory dest=/mnt2
- sudo: yes
- name: Add jobs volume mount point to /etc/fstab
mount: state=mounted src={{job_store_dev}} name=/mnt2 fstype=auto passno=2
- sudo: yes
- name: Prepare jobs volume directory structure
file: state=directory dest=/mnt2/jenkins/jobs
- sudo: yes
- name: Prepare Jenkins jobs bind mount point
file: state=directory dest=/var/lib/jenkins/jobs
- sudo: yes
- name: Add Jenkins jobs bind mount point to /etc/fstab
mount: state=mounted src=/mnt2/jenkins/jobs name=/var/lib/jenkins/jobs
fstype=none opts="defaults,bind" passno=0
- sudo: yes
diff --git a/per-service/jenkins/jenkins.yml b/per-service/jenkins/jenkins.yml
index 36ee1bd..d6a255f 100644
--- a/per-service/jenkins/jenkins.yml
+++ b/per-service/jenkins/jenkins.yml
@@ -1,6 +1,7 @@
---
- hosts: jenkins-generic
gather_facts: no
+ become: yes
vars:
- linaro_android_build_tools_repo: http://git.linaro.org/git/infrastructure/linaro-android-build-tools.git
- linaro_android_build_tools_rev: HEAD
@@ -34,17 +35,18 @@
- name: Check out linaro-android-build-tools
git: name={{linaro_android_build_tools_repo}} version={{linaro_android_build_tools_rev}}
dest=/srv/linaro-android-build-tools
- sudo: yes
tags:
- git
- hosts: ci.linaro.org
gather_facts: no
+ become: yes
roles:
- dput-config
- {role: squid, tags: ["squid"]}
- hosts: android-build.linaro.org
gather_facts: no
+ become: yes
roles:
- {role: jenkins-cronjobs, tags: ["cron"]}
diff --git a/per-service/jenkins/roles/apache/tasks/main.yml b/per-service/jenkins/roles/apache/tasks/main.yml
index afd886e..8f644d9 100644
--- a/per-service/jenkins/roles/apache/tasks/main.yml
+++ b/per-service/jenkins/roles/apache/tasks/main.yml
@@ -1,13 +1,11 @@
- name: Install Apache2
apt: pkg={{item}}
- sudo: yes
with_items:
- apache2
# This is actually needed only for android-build frontend app
- libapache2-mod-wsgi
- name: Enable Apache modules
command: a2enmod {{item}} creates=/etc/apache2/mods-enabled/{{item}}.load
- sudo: yes
with_items:
- proxy
- proxy_http
diff --git a/per-service/jenkins/roles/common/handlers/main.yml b/per-service/jenkins/roles/common/handlers/main.yml
index 3dc9a22..9486f97 100644
--- a/per-service/jenkins/roles/common/handlers/main.yml
+++ b/per-service/jenkins/roles/common/handlers/main.yml
@@ -1,7 +1,5 @@
- name: Restart Apache
service: name=apache2 state=restarted
- sudo: yes
- name: Restart SSHD
service: name=ssh state=restarted
- sudo: yes
diff --git a/per-service/jenkins/roles/common/tasks/main.yml b/per-service/jenkins/roles/common/tasks/main.yml
index 3e46c32..349da10 100644
--- a/per-service/jenkins/roles/common/tasks/main.yml
+++ b/per-service/jenkins/roles/common/tasks/main.yml
@@ -1,10 +1,8 @@
- name: apt-get update
apt: update_cache=yes
- sudo: yes
- name: Install base packages
apt: pkg={{item}}
- sudo: yes
with_items:
- bzr
- git-core
diff --git a/per-service/jenkins/roles/dput-config/tasks/main.yml b/per-service/jenkins/roles/dput-config/tasks/main.yml
index 0c8ab35..1166fe2 100644
--- a/per-service/jenkins/roles/dput-config/tasks/main.yml
+++ b/per-service/jenkins/roles/dput-config/tasks/main.yml
@@ -4,7 +4,6 @@
with_items:
- /var/lib/jenkins/.dput.cf
- /var/lib/jenkins/copyToSlave/.dput.cf
- sudo: yes
tags:
- config
- dput
diff --git a/per-service/jenkins/roles/frontend/tasks/main.yml b/per-service/jenkins/roles/frontend/tasks/main.yml
index 10c60b7..06a7451 100644
--- a/per-service/jenkins/roles/frontend/tasks/main.yml
+++ b/per-service/jenkins/roles/frontend/tasks/main.yml
@@ -1,6 +1,5 @@
- name: Install Frontend package dependencies
apt: pkg={{item}}
- sudo: yes
with_items:
- libapache2-mod-wsgi
- python-virtualenv
@@ -16,90 +15,75 @@
- name: Create frontend user
user: name=build-system-frontend comment="Android Build Frontend"
- sudo: yes
- name: Create Frontend var dir
file: state=directory path=/var/lib/linaro-abs-frontend/ owner=www-data
- sudo: yes
- name: Install Frontend/Jenkins auth password
copy: content={{ lookup('password', cred_store + '/jenkins/frontend') }}
dest=/var/lib/linaro-abs-frontend/jenkins-password mode=0640
sudo_user: www-data
- sudo: yes
when: not jenkins_config_from_backup|bool
- name: Install Frontend/Jenkins auth password
copy: content={{jenkins_frontend_passwd}}
dest=/var/lib/linaro-abs-frontend/jenkins-password mode=0640
sudo_user: www-data
- sudo: yes
when: jenkins_config_from_backup|bool
- name: Check out Frontend
git: name={{linaro_android_frontend_repo}} version={{linaro_android_frontend_rev}}
dest=~/frontend-{{linaro_android_frontend_rev}}
sudo_user: build-system-frontend
- sudo: yes
tags:
- git
- name: Create Frontend current version symlink
file: state=link src=~/frontend-{{linaro_android_frontend_rev}}/ dest=~/frontend
sudo_user: build-system-frontend
- sudo: yes
tags:
- git
- name: Install Frontend
shell: cd ~/frontend; make
sudo_user: build-system-frontend
- sudo: yes
- name: Create production config
# TODO: actually replace SECRET_KEY
template: src=settings_prod.py dest=~build-system-frontend/ mode=0640 owner=build-system-frontend group=www-data
- sudo: yes
notify:
- Restart Apache
- name: Create config symlink
# wart: relative symlinks not supported
file: state=link src=~/settings_prod.py dest=~/frontend/settings_prod.py
sudo_user: build-system-frontend
- sudo: yes
- name: Create DB
shell: cd ~build-system-frontend/frontend; ./bin/manage syncdb --noinput --settings settings_prod
sudo_user: www-data
- sudo: yes
# Fixture is automatically installed by syncdb
#sudo -u www-data ./bin/manage loaddata --settings settings_prod group-fixture.json
- name: Download YUI3
get_url: url=http://yui.zenfs.com/releases/yui3/yui_3.3.0.zip dest=~/yui_3.3.0.zip
sudo_user: build-system-frontend
- sudo: yes
register: download_yui3
- name: Extract YUI3
shell: cd ~; unzip -o -q yui_3.3.0.zip
sudo_user: build-system-frontend
- sudo: yes
when: download_yui3.changed
- name: Checkout patched lazr-js
bzr: name=lp:~mwhudson/lazr-js/combo-mod_wsgi-config dest=~/lazr-js
# version=?
sudo_user: build-system-frontend
- sudo: yes
- name: Setup lazr-js 1/3
file: state=directory path=~/lazr-js/{{item}}
with_items:
- build/3.3.0
- build/gallery
sudo_user: build-system-frontend
- sudo: yes
- name: Setup lazr-js 2/3
file: state=link src=~/yui/build/ dest=~/lazr-js/build/3.3.0/build
sudo_user: build-system-frontend
- sudo: yes
- name: Setup lazr-js 3/3
file: state=directory path=~/lazr-js/build/gallery/{{item}}
with_items:
@@ -107,7 +91,6 @@
- gallery-outside-events
- gallery-base64
sudo_user: build-system-frontend
- sudo: yes
- name: Fetch YUI gallery components
get_url: url=http://yui.yahooapis.com/combo?gallery-2010.12.16-18-24/build/{{item}}/{{item}}-min.js
@@ -117,4 +100,3 @@
- gallery-outside-events
- gallery-base64
sudo_user: build-system-frontend
- sudo: yes
diff --git a/per-service/jenkins/roles/jenkins-cli/tasks/main.yml b/per-service/jenkins/roles/jenkins-cli/tasks/main.yml
index 1f0691d..a73af81 100644
--- a/per-service/jenkins/roles/jenkins-cli/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-cli/tasks/main.yml
@@ -14,4 +14,3 @@
until: result | success
retries: 10
delay: 7
- sudo: yes
diff --git a/per-service/jenkins/roles/jenkins-config-git/tasks/main.yml b/per-service/jenkins/roles/jenkins-config-git/tasks/main.yml
index 86b26f3..c8bd2f1 100644
--- a/per-service/jenkins/roles/jenkins-config-git/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-config-git/tasks/main.yml
@@ -10,7 +10,6 @@
- name: Ensure Jenkins config dir exists
file: path=/var/lib/jenkins owner=jenkins state=directory
- sudo: yes
when: checkout_exists.stat.exists == False
tags:
- git
diff --git a/per-service/jenkins/roles/jenkins-config-skeleton/handlers/main.yml b/per-service/jenkins/roles/jenkins-config-skeleton/handlers/main.yml
index 183c2bb..8c1cdd0 100644
--- a/per-service/jenkins/roles/jenkins-config-skeleton/handlers/main.yml
+++ b/per-service/jenkins/roles/jenkins-config-skeleton/handlers/main.yml
@@ -1,6 +1,5 @@
- name: Restart Jenkins
service: name=jenkins state=restarted
- sudo: yes
# Apache proxy module sees that Jenkins is gone and then
# goes into some timeout before reconnecting to it again.
# Restart forces reconnect ASAP.
diff --git a/per-service/jenkins/roles/jenkins-config-skeleton/tasks/main.yml b/per-service/jenkins/roles/jenkins-config-skeleton/tasks/main.yml
index f7b7af1..b1edf93 100644
--- a/per-service/jenkins/roles/jenkins-config-skeleton/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-config-skeleton/tasks/main.yml
@@ -5,24 +5,20 @@
#- name: Set up minimal Jenkins configuration skeleton
# # This requires recursive copy patch
# copy: backup=yes src=jenkins-config/ dest=/var/lib/jenkins/ owner=jenkins
-# sudo: yes
# notify:
# - Restart Jenkins
- name: Set up Jenkins job root dir
file: state=directory dest=/var/lib/jenkins/jobs owner=jenkins mode=0755
- sudo: yes
- name: Set up minimal Jenkins configuration skeleton 1
file: state=directory dest=/var/lib/jenkins/{{item}} owner=jenkins
- sudo: yes
with_items:
- users/admin/
- jobs/blank/
- name: Set up minimal Jenkins configuration skeleton 2
copy: backup=yes src=jenkins-config/{{item}} dest=/var/lib/jenkins/{{item}} owner=jenkins
- sudo: yes
with_items:
- users/admin/config.xml
- jobs/blank/config.xml
@@ -33,7 +29,6 @@
name: Create managed Jenkins config file
template: backup=yes src=jenkins-config/config.xml dest=/var/lib/jenkins/
owner=jenkins mode=0644
- sudo: yes
notify:
- Restart Jenkins
@@ -41,17 +36,14 @@
name: Create Ansible-speced Jenkins config file as config.xml.ansible
template: backup=yes src=jenkins-config/config.xml dest=/var/lib/jenkins/config.xml.ansible
owner=jenkins mode=0644
- sudo: yes
notify:
- Restart Jenkins
- when: not jenkins_managed_config|bool
name: Copy config.xml.ansible to config.xml if configuring first time (fail means config.xml is not updated)
shell: "cd /var/lib/jenkins; [ ! -f config.xml ] && cp config.xml.ansible config.xml"
ignore_errors: yes
- sudo: yes
sudo_user: jenkins
- name: Create Jenkins external address config
template: src=jenkins-config/hudson.tasks.Mailer.xml
dest=/var/lib/jenkins/hudson.tasks.Mailer.xml owner=jenkins mode=0644 backup=yes
- sudo: yes
diff --git a/per-service/jenkins/roles/jenkins-cronjobs/tasks/main.yml b/per-service/jenkins/roles/jenkins-cronjobs/tasks/main.yml
index 262ddc2..0fc8556 100644
--- a/per-service/jenkins/roles/jenkins-cronjobs/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-cronjobs/tasks/main.yml
@@ -1,4 +1,3 @@
- name: Set up cronjob to expire old builds of inactive jobs
template: src=linaro-jenkins dest=/etc/cron.d/linaro-jenkins
owner=root group=root mode=0644
- sudo: yes
diff --git a/per-service/jenkins/roles/jenkins-linaro-theme/tasks/main.yml b/per-service/jenkins/roles/jenkins-linaro-theme/tasks/main.yml
index 3a94ccb..27a642b 100644
--- a/per-service/jenkins/roles/jenkins-linaro-theme/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-linaro-theme/tasks/main.yml
@@ -1,14 +1,12 @@
- name: Checkout jenkins-linaro-theme
git: name=http://git.linaro.org/git/infrastructure/jenkins-linaro-theme.git
dest=/var/lib/jenkins/userContent/theme
- sudo: yes
tags:
- git
- jenkins-install
- name: Enable jenkins-linaro-theme
template: src=org.codefirst.SimpleThemeDecorator.xml dest=/var/lib/jenkins/org.codefirst.SimpleThemeDecorator.xml mode=0644
- sudo: yes
notify:
- Restart Jenkins
tags:
diff --git a/per-service/jenkins/roles/jenkins-ssh-publish/tasks/main.yml b/per-service/jenkins/roles/jenkins-ssh-publish/tasks/main.yml
index c6dac2c..d2fc8e9 100644
--- a/per-service/jenkins/roles/jenkins-ssh-publish/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-ssh-publish/tasks/main.yml
@@ -1,18 +1,15 @@
- name: Set up Jenkins Publish-over-SSH config file
template: src=jenkins.plugins.publish_over_ssh.BapSshPublisherPlugin.xml
dest=/var/lib/jenkins/ owner=jenkins backup=yes
- sudo: yes
notify:
- Restart Jenkins
tags:
- template
- name: Create keys dir
file: state=directory path=/var/lib/jenkins/.ssh/
- sudo: yes
- name: Copy keys
copy: src={{secrets_dir}}/jenkins-publish/{{item}} dest=/var/lib/jenkins/.ssh/ owner=jenkins mode=0400
backup=yes
with_items:
- linaro-ci-publish
- linaro-ci-publish-trigger
- sudo: yes
diff --git a/per-service/jenkins/roles/jenkins-user/tasks/main.yml b/per-service/jenkins/roles/jenkins-user/tasks/main.yml
index 13abbfc..fb0b712 100644
--- a/per-service/jenkins/roles/jenkins-user/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-user/tasks/main.yml
@@ -1,8 +1,6 @@
- name: Create Jenkins "frontend" user dir
file: state=directory dest=/var/lib/jenkins/users/frontend owner=jenkins
- sudo: yes
- name: Create Jenkins "frontend" user config
template: src=jenkins-config/users/frontend/config.xml
dest=/var/lib/jenkins/users/frontend/config.xml owner=jenkins
- sudo: yes
diff --git a/per-service/jenkins/roles/jenkins-utils-set-jenkins-url/tasks/main.yml b/per-service/jenkins/roles/jenkins-utils-set-jenkins-url/tasks/main.yml
index 1d0e759..c3cfc4c 100644
--- a/per-service/jenkins/roles/jenkins-utils-set-jenkins-url/tasks/main.yml
+++ b/per-service/jenkins/roles/jenkins-utils-set-jenkins-url/tasks/main.yml
@@ -3,7 +3,6 @@
--file=/var/lib/jenkins/jenkins.model.JenkinsLocationConfiguration.xml
--backup --really
chdir=linaro-jenkins-tools/mangle-jobs/
- sudo: yes
sudo_user: jenkins
when: "not production|bool and jenkins_config_from_backup|bool"
notify:
diff --git a/per-service/jenkins/roles/jenkins/handlers/main.yml b/per-service/jenkins/roles/jenkins/handlers/main.yml
index 183c2bb..8c1cdd0 100644
--- a/per-service/jenkins/roles/jenkins/handlers/main.yml
+++ b/per-service/jenkins/roles/jenkins/handlers/main.yml
@@ -1,6 +1,5 @@
- name: Restart Jenkins
service: name=jenkins state=restarted
- sudo: yes
# Apache proxy module sees that Jenkins is gone and then
# goes into some timeout before reconnecting to it again.
# Restart forces reconnect ASAP.
diff --git a/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml b/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml
index 789dd2e..66319ed 100644
--- a/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml
+++ b/per-service/jenkins/roles/jenkins/tasks/jenkins-pkgs.yml
@@ -1,6 +1,5 @@
- name: Install Jenkins dependency packages
apt: pkg={{item}}
- sudo: yes
with_items:
- default-jre
- daemon
@@ -19,7 +18,6 @@
# with it trying to doing something on plugins we download, etc.
- name: Stop Jenkins (if running)
service: name=jenkins state=stopped
- sudo: yes
ignore_errors: yes
notify:
- Restart Jenkins
@@ -28,7 +26,6 @@
- name: Install Jenkins
shell: RUNLEVEL=1 dpkg -i --skip-same-version /tmp/jenkins_{{jenkins_version}}_all.deb
- sudo: yes
register: dpkg_result
changed_when: "'already installed' not in dpkg_result.stderr"
notify:
@@ -40,7 +37,6 @@
# System-level Jenkins configuration
- name: Configure Jenkins port
lineinfile: regexp="^HTTP_PORT=" line="HTTP_PORT={{jenkins_port}}" dest=/etc/default/jenkins backup=yes
- sudo: yes
when: jenkins_port != 8080
- name: Configure Jenkins URL prefix
@@ -51,7 +47,6 @@
lineinfile: regexp='^JENKINS_ARGS=(?!.*--prefix=/jenkins)"?(.+?)"?$'
line='JENKINS_ARGS="\1 --prefix={{jenkins_prefix}}"'
dest=/etc/default/jenkins backrefs=yes
- sudo: yes
when: jenkins_prefix != "/"
- name: Set Java properties required to tweak Jenkins behavior
@@ -60,4 +55,3 @@
lineinfile: regexp="^JAVA_ARGS="
line="JAVA_ARGS=\"-Djava.awt.headless=true -Dhudson.slaves.WorkspaceList='_' -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -Dorg.eclipse.jetty.server.Request.maxFormContentSize=300000\""
dest=/etc/default/jenkins backup=yes
- sudo: yes
diff --git a/per-service/jenkins/roles/jenkins/tasks/jenkins-plugins.yml b/per-service/jenkins/roles/jenkins/tasks/jenkins-plugins.yml
index 384d31b..8a08202 100644
--- a/per-service/jenkins/roles/jenkins/tasks/jenkins-plugins.yml
+++ b/per-service/jenkins/roles/jenkins/tasks/jenkins-plugins.yml
@@ -1,12 +1,10 @@
- name: Create Jenkins plugin dir
file: state=directory path=~jenkins/plugins/ owner=jenkins
- sudo: yes
tags:
- jenkins-install
- name: Download Jenkins plugins which override builtin ones
get_url: url={{item.url}} dest=~jenkins/plugins/{{item.file}} force=yes owner=jenkins
- sudo: yes
with_items: jenkins_override_plugins
notify:
- Restart Jenkins
@@ -15,7 +13,6 @@
- name: Pin Jenkins plugins which override builtin ones
copy: content="" dest=~jenkins/plugins/{{item.file}}.pinned owner=jenkins mode=0644
- sudo: yes
with_items: jenkins_override_plugins
notify:
- Restart Jenkins
@@ -24,7 +21,6 @@
- name: Download "normal" Jenkins plugins
get_url: url={{item}} dest=~jenkins/plugins/ owner=jenkins
- sudo: yes
with_items: jenkins_plugins
notify:
- Restart Jenkins
diff --git a/per-service/jenkins/roles/linaro-jenkins-tools/tasks/main.yml b/per-service/jenkins/roles/linaro-jenkins-tools/tasks/main.yml
index f2d8c90..4a21cbd 100644
--- a/per-service/jenkins/roles/linaro-jenkins-tools/tasks/main.yml
+++ b/per-service/jenkins/roles/linaro-jenkins-tools/tasks/main.yml
@@ -1,6 +1,5 @@
- name: Install dependent packages
apt: pkg={{item}}
- sudo: yes
with_items:
- python-lxml
@@ -8,7 +7,6 @@
git: name=http://git.linaro.org/git/infrastructure/linaro-jenkins-tools.git
dest=/srv/linaro-jenkins-tools
version="HEAD"
- sudo: yes
tags:
- git
# Up to date checkout required for mangle-jobs
diff --git a/per-service/jenkins/roles/reposeed/tasks/main.yml b/per-service/jenkins/roles/reposeed/tasks/main.yml
index ecfd728..30246df 100644
--- a/per-service/jenkins/roles/reposeed/tasks/main.yml
+++ b/per-service/jenkins/roles/reposeed/tasks/main.yml
@@ -1,8 +1,6 @@
#- name: Create seed directory
# file: state=directory path=/mnt2/seed
-# sudo: yes
- name: Create seed symlink
file: state=link src=jenkins/jobs/_extra/seed dest=/mnt2/seed
force=yes
- sudo: yes
diff --git a/per-service/jenkins/roles/squid/tasks/main.yml b/per-service/jenkins/roles/squid/tasks/main.yml
index 94a410d..bd90c7d 100644
--- a/per-service/jenkins/roles/squid/tasks/main.yml
+++ b/per-service/jenkins/roles/squid/tasks/main.yml
@@ -1,9 +1,7 @@
- name: Install Squid
apt: pkg={{item}}
- sudo: yes
with_items:
- squid
- name: Install Squid config
copy: src=squid.conf dest=/etc/squid3/squid.conf
- sudo: yes