Merge branch 'master' into GSRE-2341

Author: bgudditi

playbooks/roles/edxapp/tasks/deploy.yml

@@ -288,13 +288,21 @@
 
 # --no-save is passed as a flag to npm install to avoid saving these dependencies to package.json. Otherwise,
 # running npm install without this flag causes modifications to the package.json and package-lock.json
-# files. In turn, these modified files cause issues with working with the edxapp repository.
+# files. In turn, these modified files cause issues with working with the edxapp repository because,
+# while doing the setup "checkout edx-platform repo into {{ edxapp_code_dir }}" fails.
+# This only fails in sandbox, prod and stg are fine without this change (--no-save)
+#
+# See https://github.com/edx/configuration/pull/256 for more details.
 
 - name: Install private node dependencies
-  shell: "easy_install --version && npm install --no-save {{ item.name }}"
-  with_items:
-    - "{{ EDXAPP_PRIVATE_NPM_REQUIREMENTS }}"
-    - "{{ EDXAPP_PRIVATE_NPM_REQUIREMENTS_TESTING }}"
+  shell: "easy_install --version && npm install --no-save {{ all_npm_packages | join(' ') }}"
+  vars:
+    all_npm_packages: >-
+      {{
+        (EDXAPP_PRIVATE_NPM_REQUIREMENTS + EDXAPP_PRIVATE_NPM_REQUIREMENTS_TESTING)
+        | map(attribute='name')
+        | list
+      }}
   args:
     chdir: "{{ edxapp_code_dir }}"
   become_user: "{{ edxapp_user }}"