diff options
| author | Alexander Neben <alexander.neben@mongodb.com> | 2022-11-18 20:07:00 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-11-23 00:53:22 +0000 |
| commit | cbc3c7b43abd7e21e3f27e68c3631983524c6a65 (patch) | |
| tree | cda980b3c350bd396f09f5497d504ac4034adc13 | |
| parent | 6d25a5cdb5ff9a6061058b029624704c6b280590 (diff) | |
| download | mongo-cbc3c7b43abd7e21e3f27e68c3631983524c6a65.tar.gz | |
SERVER-71471 Fixed deployment process for jstestfuzz
(cherry picked from commit 45400e2540977847771a1172de82a01fb12ec8b4)
| -rw-r--r-- | etc/evergreen.yml | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 9d904397ba8..1b2ae0d7d28 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1074,20 +1074,6 @@ functions: fi echo "python set to $(which $python)" - - key: add_nodejs_to_path - value: | - # Add node and npm binaries to PATH - if [ "Windows_NT" = "$OS" ]; then - # An "npm" directory might not have been created in %APPDATA% by the Windows installer. - # Work around the issue by specifying a different %APPDATA% path. - # See: https://github.com/nodejs/node-v0.x-archive/issues/8141 - export APPDATA=${workdir}/npm-app-data - export PATH="$PATH:/cygdrive/c/Program Files (x86)/nodejs" # Windows location - # TODO: this is to work around BUILD-8652 - cd "$(pwd -P | sed 's,cygdrive/c/,cygdrive/z/,')" - else - export PATH="$PATH:/opt/node/bin" - fi - key: posix_workdir value: eval 'if [ "Windows_NT" = "$OS" ]; then echo $(cygpath -u "${workdir}"); else echo ${workdir}; fi' # For ssh disable the options GSSAPIAuthentication, CheckHostIP, StrictHostKeyChecking @@ -2190,15 +2176,8 @@ functions: set -o errexit set -o verbose - ${add_nodejs_to_path} - git clone git@github.com:10gen/jstestfuzz.git - pushd jstestfuzz - npm install - npm run prepare - popd - "lint fuzzer sanity patch": - command: shell.exec type: test @@ -2209,11 +2188,9 @@ functions: set -eo pipefail set -o verbose - ${add_nodejs_to_path} - # Run parse-jsfiles on 50 files at a time with 32 processes in parallel. # Grep returns 1 if it fails to find a match. - (grep "\.js$" modified_and_created_patch_files.txt || true) | xargs -P 32 -L 50 npm run --prefix jstestfuzz parse-jsfiles -- + (grep "\.js$" modified_and_created_patch_files.txt || true) | xargs -P 32 -L 50 ./jstestfuzz/src/scripts/npm_run.sh --prefix jstestfuzz parse-jsfiles -- "lint fuzzer sanity all": - command: shell.exec @@ -2225,10 +2202,8 @@ functions: set -eo pipefail set -o verbose - ${add_nodejs_to_path} - # Run parse-jsfiles on 50 files at a time with 32 processes in parallel. - find "$PWD/jstests" "$PWD/src/mongo/db/modules/enterprise" -path "$PWD/jstests/third_party" -prune -o -name "*.js" -print | xargs -P 32 -L 50 npm run --prefix jstestfuzz parse-jsfiles -- + find "$PWD/jstests" "$PWD/src/mongo/db/modules/enterprise" -path "$PWD/jstests/third_party" -prune -o -name "*.js" -print | xargs -P 32 -L 50 ./jstestfuzz/src/scripts/npm_run.sh --prefix jstestfuzz parse-jsfiles -- "run jstestfuzz": - command: shell.exec @@ -2249,9 +2224,7 @@ functions: set -o errexit set -o verbose - ${add_nodejs_to_path} - - npm run ${npm_command|jstestfuzz} -- ${jstestfuzz_vars} --branch ${branch_name} + ./src/scripts/npm_run.sh ${npm_command|jstestfuzz} -- ${jstestfuzz_vars} --branch ${branch_name} - command: archive.targz_pack params: |