Compare commits

...

3 Commits

Author SHA1 Message Date
bert-e 31406c8317 Merge branch 'improvement/ZENKO-1271-yarn' into tmp/octopus/w/8.1/improvement/ZENKO-1271-yarn 2018-10-19 00:29:37 +00:00
Rahul Padigela 7f5cd8e694 improvement: upgrade dependencies to latest 2018-10-18 17:24:27 -07:00
Rahul Padigela 360adb4a0a improvement: switch to yarn 2018-10-18 17:24:23 -07:00
6 changed files with 4462 additions and 5136 deletions

View File

@ -83,9 +83,9 @@ models:
command: bash eve/workers/build/credentials.bash command: bash eve/workers/build/credentials.bash
haltOnFailure: True haltOnFailure: True
env: *global-env env: *global-env
- ShellCommand: &npm-install - ShellCommand: &yarn
name: install modules name: install modules
command: npm install command: yarn
haltOnFailure: True haltOnFailure: True
- Upload: &upload-artifacts - Upload: &upload-artifacts
source: /artifacts source: /artifacts
@ -132,21 +132,21 @@ stages:
- '/home/eve/workspace' - '/home/eve/workspace'
steps: steps:
- Git: *clone - Git: *clone
- ShellCommand: *npm-install - ShellCommand: *yarn
- ShellCommand: *add-hostname - ShellCommand: *add-hostname
- ShellCommand: - ShellCommand:
name: Linting name: Linting
command: | command: |
npm run --silent lint -- --max-warnings 0 yarn run --silent lint -- --max-warnings 0
npm run --silent lint_md yarn run --silent lint_md
flake8 $(git ls-files "*.py") flake8 $(git ls-files "*.py")
yamllint $(git ls-files "*.yml") yamllint $(git ls-files "*.yml")
- ShellCommand: - ShellCommand:
name: Unit Coverage name: Unit Coverage
command: | command: |
mkdir -p $CIRCLE_TEST_REPORTS/unit mkdir -p $CIRCLE_TEST_REPORTS/unit
npm run unit_coverage yarn unit_coverage
npm run unit_coverage_legacy_location yarn unit_coverage_legacy_location
env: &shared-vars env: &shared-vars
CIRCLE_TEST_REPORTS: /tmp CIRCLE_TEST_REPORTS: /tmp
CIRCLE_ARTIFACTS: /tmp CIRCLE_ARTIFACTS: /tmp
@ -171,14 +171,14 @@ stages:
steps: steps:
- Git: *clone - Git: *clone
- ShellCommand: *credentials - ShellCommand: *credentials
- ShellCommand: *npm-install - ShellCommand: *yarn
- ShellCommand: - ShellCommand:
command: | command: |
bash -c " bash -c "
source /root/.aws/exports &> /dev/null source /root/.aws/exports &> /dev/null
set -ex set -ex
bash wait_for_local_port.bash 8000 40 bash wait_for_local_port.bash 8000 40
npm run multiple_backend_test" yarn multiple_backend_test"
<<: *follow-s3-log <<: *follow-s3-log
env: env:
<<: *multiple-backend-vars <<: *multiple-backend-vars
@ -215,12 +215,12 @@ stages:
steps: steps:
- Git: *clone - Git: *clone
- ShellCommand: *credentials - ShellCommand: *credentials
- ShellCommand: *npm-install - ShellCommand: *yarn
- ShellCommand: - ShellCommand:
command: | command: |
set -ex set -ex
bash wait_for_local_port.bash 8000 40 bash wait_for_local_port.bash 8000 40
npm run ft_test yarn ft_test
<<: *follow-s3-log <<: *follow-s3-log
env: env:
<<: *mongo-vars <<: *mongo-vars
@ -244,12 +244,12 @@ stages:
steps: steps:
- Git: *clone - Git: *clone
- ShellCommand: *credentials - ShellCommand: *credentials
- ShellCommand: *npm-install - ShellCommand: *yarn
- ShellCommand: - ShellCommand:
command: | command: |
set -ex set -ex
bash wait_for_local_port.bash 8000 40 bash wait_for_local_port.bash 8000 40
npm run ft_test yarn ft_test
<<: *follow-s3-log <<: *follow-s3-log
env: env:
<<: *file-mem-mpu <<: *file-mem-mpu

View File

@ -7,5 +7,5 @@ maven
netcat netcat
redis-server redis-server
ruby-full ruby-full
yarn=1.7.0-1 yarn
zlib1g-dev zlib1g-dev

View File

@ -86,7 +86,7 @@ spec:
- -ec - -ec
- | - |
sleep 10 # wait for mongo sleep 10 # wait for mongo
/usr/src/app/docker-entrypoint.sh npm start | tee -a /artifacts/s3.log /usr/src/app/docker-entrypoint.sh yarn start | tee -a /artifacts/s3.log
env: env:
{% if vars.env.S3DATA is defined and vars.env.S3DATA == "multiple" -%} {% if vars.env.S3DATA is defined and vars.env.S3DATA == "multiple" -%}
- name: S3_LOCATION_FILE - name: S3_LOCATION_FILE

5102
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -19,47 +19,47 @@
}, },
"homepage": "https://github.com/scality/S3#readme", "homepage": "https://github.com/scality/S3#readme",
"dependencies": { "dependencies": {
"aws-sdk": "2.28.0",
"arsenal": "scality/Arsenal#9fe16c6", "arsenal": "scality/Arsenal#9fe16c6",
"async": "~2.5.0", "async": "~2.6.1",
"aws-sdk": "2.338.0",
"azure-storage": "^2.1.0", "azure-storage": "^2.1.0",
"backo": "^1.1.0", "backo": "^1.1.0",
"bucketclient": "scality/bucketclient#5aa99d7", "bucketclient": "scality/bucketclient#5aa99d7",
"bufferutil": "^3.0.5", "bufferutil": "^4.0.0",
"commander": "^2.9.0", "commander": "^2.9.0",
"diskusage": "0.2.4", "diskusage": "0.2.5",
"google-auto-auth": "^0.9.1", "google-auto-auth": "^0.10.1",
"http-proxy": "^1.17.0", "http-proxy": "^1.17.0",
"https-proxy-agent": "^2.2.0", "https-proxy-agent": "^2.2.0",
"mongodb": "^2.2.31", "mongodb": "^3.1.8",
"node-forge": "^0.7.1", "node-forge": "^0.7.1",
"node-uuid": "^1.4.3", "node-uuid": "^1.4.3",
"npm-run-all": "~4.0.2", "npm-run-all": "~4.1.3",
"prom-client": "^10.2.3", "prom-client": "^11.1.3",
"request": "^2.81.0", "request": "^2.81.0",
"sproxydclient": "scality/sproxydclient#45090b7", "sproxydclient": "scality/sproxydclient#45090b7",
"sql-where-parser": "~2.2.1", "sql-where-parser": "~2.2.1",
"utapi": "scality/utapi#f2f1d0c", "utapi": "scality/utapi#f2f1d0c",
"utf-8-validate": "^4.0.2", "utf-8-validate": "^5.0.1",
"utf8": "~2.1.1", "utf8": "~3.0.0",
"uuid": "^3.0.1", "uuid": "^3.0.1",
"vaultclient": "scality/vaultclient#754b6e1", "vaultclient": "scality/vaultclient#754b6e1",
"werelogs": "scality/werelogs#74b121b", "werelogs": "scality/werelogs#74b121b",
"ws": "^5.1.0", "ws": "^6.1.0",
"xml2js": "~0.4.16" "xml2js": "~0.4.16"
}, },
"devDependencies": { "devDependencies": {
"bluebird": "^3.3.1", "bluebird": "^3.3.1",
"eslint": "^2.4.0", "eslint": "^5.7.0",
"eslint-config-airbnb": "^6.0.0", "eslint-config-airbnb": "^17.1.0",
"eslint-config-scality": "scality/Guidelines#0a771c2", "eslint-config-scality": "scality/Guidelines#0a771c2",
"ioredis": "2.4.0", "ioredis": "4.2.0",
"istanbul": "1.0.0-alpha.2", "istanbul": "1.0.0-alpha.2",
"istanbul-api": "1.0.0-alpha.13", "istanbul-api": "2.0.6",
"lolex": "^1.4.0", "lolex": "^3.0.0",
"mocha": "^2.3.4", "mocha": "^5.2.0",
"mocha-junit-reporter": "1.11.1", "mocha-junit-reporter": "1.18.0",
"node-mocks-http": "1.5.2", "node-mocks-http": "1.7.3",
"s3blaster": "scality/s3blaster#950fab1", "s3blaster": "scality/s3blaster#950fab1",
"tv4": "^1.2.7" "tv4": "^1.2.7"
}, },

4428
yarn.lock Normal file

File diff suppressed because it is too large Load Diff