Repository: couchdb-ci
Updated Branches:
  refs/heads/master b243488ae -> a074a6842


Upgrade node to 6.x / npm to 3.x


Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/919caf04
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/919caf04
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/919caf04

Branch: refs/heads/master
Commit: 919caf04b2fe2406a9c923a5b7e0539cbe2883ff
Parents: b243488
Author: Joan Touzet <woh...@apache.org>
Authored: Wed Mar 22 15:56:24 2017 -0700
Committer: Joan Touzet <woh...@apache.org>
Committed: Wed Mar 22 15:56:24 2017 -0700

----------------------------------------------------------------------
 ansible/debian-8-base.yml                        |  2 +-
 ansible/roles/dependencies-centos/tasks/main.yml | 13 +++++++++++--
 ansible/ubuntu-14.04-base.yml                    |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/919caf04/ansible/debian-8-base.yml
----------------------------------------------------------------------
diff --git a/ansible/debian-8-base.yml b/ansible/debian-8-base.yml
index b98e973..02c624a 100644
--- a/ansible/debian-8-base.yml
+++ b/ansible/debian-8-base.yml
@@ -19,6 +19,6 @@
   remote_user: root
   roles:
   - debian-8
-  - nodesource.node
+  - { role: nodesource.node, nodejs_version: '6.x' }
   - dependencies-debian
   - common

http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/919caf04/ansible/roles/dependencies-centos/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/dependencies-centos/tasks/main.yml 
b/ansible/roles/dependencies-centos/tasks/main.yml
index 9d6efec..e812142 100644
--- a/ansible/roles/dependencies-centos/tasks/main.yml
+++ b/ansible/roles/dependencies-centos/tasks/main.yml
@@ -34,9 +34,18 @@
   - libicu-devel
   - libtool
 
-- name: install nodejs 4.x
+- name: download nodejs 6.x repo setup script
+  get_url:
+    url: https://rpm.nodesource.com/setup_6.x
+    dest: /tmp/setup_6.x
+    mode: 0755
+
+- name: setup nodejs 6.x repo
+  command: /tmp/setup_6.x
+
+- name: install nodejs and npm
   yum:
-    name: 
"https://rpm.nodesource.com/pub_4.x/el/7/x86_64/nodejs-4.2.6-1nodesource.el7.centos.x86_64.rpm";
+    name: nodejs
     state: present
 
 # download, compile and install Spidermonkey

http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/919caf04/ansible/ubuntu-14.04-base.yml
----------------------------------------------------------------------
diff --git a/ansible/ubuntu-14.04-base.yml b/ansible/ubuntu-14.04-base.yml
index 030559c..e89838a 100644
--- a/ansible/ubuntu-14.04-base.yml
+++ b/ansible/ubuntu-14.04-base.yml
@@ -19,6 +19,6 @@
   remote_user: root
   roles:
   - ubuntu-1404
-  - nodesource.node
+  - { role: nodesource.node, nodejs_version: '6.x' }
   - dependencies-debian
   - common

Reply via email to