Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/189100

Change subject: Purge node_modules explicitly
......................................................................

Purge node_modules explicitly

Projects having a 'deploy' repository share a common job for their
source code and deploy repos.  For source repository we run npm install,
for deploy we just point to the provided node_modules path.

When setting up the cxserver-deploy-npm and cxserver-source-npm jobs,
I found out our slave script 'npm-set-env.sh' deletes the node_modules
which has just been created by the setup-npm-oid macro.

rm -fr node_modules just before any 'npm install' command.

A second change is needed to remove the command from npm-set-env.sh

Change-Id: Iaa282f68f3f3d769402be3164b0a87e48518444a
---
M jjb/macro.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/00/189100/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index a627127..972a562 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -203,6 +203,7 @@
         . /srv/deployment/integration/slave-scripts/bin/npm-set-env.sh
         node --version
         npm --version
+        rm -rf node_modules
         npm install
         npm test
 
@@ -215,6 +216,8 @@
          repository: '{repository}'
      - shell: |
          . /srv/deployment/integration/slave-scripts/bin/npm-set-env.sh
+         # node_modules is not purged, taken care of by setup-npm-oid
+
          node --version
          npm --version
          . npm-oid.env
@@ -244,6 +247,7 @@
         "source")
             NPM_SET_PATH="."
             echo "Running npm install"
+            rm -rf node_modules
             npm install
             ;;
         "deploy")
@@ -420,6 +424,7 @@
         . /srv/deployment/integration/slave-scripts/bin/mw-set-env-qunit.sh
         cd $MW_INSTALL_PATH
         . /srv/deployment/integration/slave-scripts/bin/npm-set-env.sh
+        rm -rf node_modules
         npm install
         grunt karma:main
 

-- 
To view, visit https://gerrit.wikimedia.org/r/189100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa282f68f3f3d769402be3164b0a87e48518444a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to