Merge pull request #19411 from code-dot-org/nodejs-daemon

wjordan · web-flow · commit f0ca59435591 · 2017-11-27T14:24:58.000-08:00
Install nodejs on daemon for building apps packages
diff --git a/cookbooks/Berksfile.lock b/cookbooks/Berksfile.lock
@@ -56,12 +56,12 @@ DEPENDENCIES
 
 GRAPH
   apt (2.6.1)
-  ark (1.0.1)
+  ark (3.1.0)
     build-essential (>= 0.0.0)
     seven_zip (>= 0.0.0)
     windows (>= 0.0.0)
   build-essential (2.1.3)
-  cdo-apps (0.2.253)
+  cdo-apps (0.2.254)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
     cdo-cloudwatch-extra-metrics (>= 0.0.0)
@@ -121,26 +121,21 @@ GRAPH
     compat_resource (>= 0.0.0)
   compat_resource (12.9.1)
   cron (1.7.4)
-  homebrew (2.0.5)
-    build-essential (>= 2.1.2)
   ixgbevf (0.1.2)
     apt (>= 0.0.0)
     yum-epel (>= 0.0.0)
   logrotate (1.9.2)
-  nodejs (2.4.4)
-    apt (>= 0.0.0)
-    ark (>= 0.0.0)
+  nodejs (5.0.0)
+    ark (>= 2.0.2)
     build-essential (>= 0.0.0)
-    homebrew (>= 0.0.0)
-    yum-epel (>= 0.0.0)
   ntp (1.8.6)
   ohai (2.1.0)
   omnibus_updater (2.0.0)
   poise (2.7.1)
   poise-service (1.3.1)
     poise (~> 2.0)
   postfix (3.7.0)
-  seven_zip (1.0.4)
+  seven_zip (2.0.2)
     windows (>= 1.2.2)
   ssl_certificate (1.11.0)
   sudo-user (0.1.1)
diff --git a/cookbooks/cdo-apps/metadata.rb b/cookbooks/cdo-apps/metadata.rb
@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-apps'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.253'
+version          '0.2.254'
 
 depends 'apt'
 depends 'build-essential'
diff --git a/cookbooks/cdo-apps/recipes/default.rb b/cookbooks/cdo-apps/recipes/default.rb
@@ -86,7 +86,12 @@
 include_recipe 'cdo-apps::build'
 
 # Install nodejs if apps build specified in attributes.
-include_recipe 'cdo-nodejs' if node['cdo-secrets'] && node['cdo-secrets']["build_apps"]
+if node['cdo-secrets']["build_apps"] ||
+  # Or install nodejs if the daemon builds apps packages in this environment.
+  # TODO keep this logic in sync with `BUILD_PACKAGE` in `package.rake`.
+  (node['cdo-apps']['daemon'] && %w[staging test].include?(node.chef_environment))
+  include_recipe 'cdo-nodejs'
+end
 
 include_recipe 'cdo-apps::dashboard'
 include_recipe 'cdo-apps::pegasus'
