You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by ba...@apache.org on 2015/08/16 19:47:27 UTC
[10/23] couchdb-ci git commit: rename ubuntu role to ubuntu worker
rename ubuntu role to ubuntu worker
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/3550348d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/3550348d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/3550348d
Branch: refs/heads/master
Commit: 3550348d5ec05d96d9f31162daa7997039241b80
Parents: d05361c
Author: Bastian Krol <ba...@web.de>
Authored: Mon Jul 6 11:07:25 2015 +0200
Committer: Bastian Krol <ba...@web.de>
Committed: Mon Jul 6 11:07:25 2015 +0200
----------------------------------------------------------------------
ansible/roles/ubuntu-worker/tasks/main.yml | 22 ++++++++++++++++++++++
ansible/roles/ubuntu/tasks/main.yml | 24 ------------------------
ansible/site.yml | 8 +++-----
vagrant/Vagrantfile | 7 +++----
4 files changed, 28 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/3550348d/ansible/roles/ubuntu-worker/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-worker/tasks/main.yml b/ansible/roles/ubuntu-worker/tasks/main.yml
new file mode 100644
index 0000000..3a8c78f
--- /dev/null
+++ b/ansible/roles/ubuntu-worker/tasks/main.yml
@@ -0,0 +1,22 @@
+---
+# even though we do not need Java to build CouchDB, a Jenkins worker still
+# needs an installed JDK or the Jenkins master yells at you when attempting to
+# connect
+- name: install jdk
+ apt:
+ name: openjdk-7-jdk
+ state: present
+
+# Install packages required to build CouchDB via apt-get
+- name: install packages required to build CouchDB
+ apt: name={{item}} state=present
+ with_items:
+ - build-essential
+ - erlang-base-hipe
+ - erlang-dev
+ - erlang-manpages
+ - erlang-eunit
+ - erlang-nox
+ - libicu-dev
+ - libmozjs185-dev
+ - libcurl4-openssl-dev
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/3550348d/ansible/roles/ubuntu/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu/tasks/main.yml b/ansible/roles/ubuntu/tasks/main.yml
deleted file mode 100644
index b14191b..0000000
--- a/ansible/roles/ubuntu/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# even though we do not need Java to build CouchDB, a Jenkins worker still
-# needs an installed JDK or the Jenkins master yells at you when attempting to
-# connect
-- name: install jdk
- apt:
- name: openjdk-7-jdk
- state: present
-
-# TODO These packages are required to build Couch. Maybe a ubuntu-build-worker
-# role would make more sense in the long run. Jenkins master does not need
-# this packages once we use a master-worker setup.
-- name: install packages required to build CouchDB
- apt: name={{item}} state=present
- with_items:
- - build-essential
- - erlang-base-hipe
- - erlang-dev
- - erlang-manpages
- - erlang-eunit
- - erlang-nox
- - libicu-dev
- - libmozjs185-dev
- - libcurl4-openssl-dev
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/3550348d/ansible/site.yml
----------------------------------------------------------------------
diff --git a/ansible/site.yml b/ansible/site.yml
index fc757a4..7675974 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -17,10 +17,8 @@
roles:
- jenkins-worker
-# Apply common configuration for all Ubuntu systems
-# TODO Currently this only contains packages needed on the workers, so rename
-# this role to ubuntu-worker
-- hosts: ubuntu
+# Apply common configuration for all Ubuntu worker
+- hosts: ubuntu-workers
remote_user: root
roles:
- - ubuntu
+ - ubuntu-worker
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/3550348d/vagrant/Vagrantfile
----------------------------------------------------------------------
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index e42bd28..c1f9a59 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -1,7 +1,6 @@
# -*- mode: ruby -*-
-# vi: set ft=ruby : # All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility).
+# vi: set ft=ruby :
+
Vagrant.configure(2) do |config|
# How much memory does the master need to test the setup? How much do the
@@ -42,7 +41,7 @@ Vagrant.configure(2) do |config|
ansible.groups = {
"jenkins-master" => ["couchdb-jenkins-master"],
"jenkins-workers" => ["couchdb-ubuntu-14.04-worker"],
- "ubuntu" => ["couchdb-ubuntu-14.04-worker"]
+ "ubuntu-workers" => ["couchdb-ubuntu-14.04-worker"]
}
end