updated yarn.lock and package.json

scality · Aug 16, 2019 · c58ad67 · c58ad67
1 parent 9ee1e05
commit c58ad67
Show file tree

Hide file tree

Showing 9 changed files with 2,496 additions and 8,524 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -48,7 +48,7 @@ Describe the results you expected
 
 - Node.js version,
 - Docker version,
-- npm version,
+- yarn version,
 - distribution/OS,
 - optional: anything else you deem helpful to us.
 

diff --git a/Dockerfile b/Dockerfile
@@ -16,11 +16,11 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
-COPY package.json package-lock.json /usr/src/app/
-RUN npm install --production \
+COPY package.json yarn.lock /usr/src/app/
+RUN yarn install --frozen-lockfile --production \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf ~/.node-gyp \
-    && rm -rf /tmp/npm-*
+    && rm -rf /tmp/yarn-*
 
 # Keep the .git directory in order to properly report version
 COPY . /usr/src/app

diff --git a/circle.yml b/circle.yml
@@ -16,16 +16,16 @@ machine:
 dependencies:
     override:
         - rm -rf node_modules
-        - npm install
+        - yarn install --frozen-lockfile
     post:
-        - cd node_modules/@zenko/cloudserver && npm run mem_backend: {background: true}
+        - cd node_modules/@zenko/cloudserver && yarn run mem_backend: {background: true}
 
 test:
     override:
         - docker run -e AUTO_CREATE_TOPICS=true -d --net=host --name kafka spotify/kafka
-        - npm run --silent lint_md -- --max-warnings 0
-        - npm run --silent lint -- --max-warnings 0
+        - yarn run --silent lint_md -- --max-warnings 0
+        - yarn run --silent lint -- --max-warnings 0
         - npm test
-        - CI=true npm start & bash tests/utils/wait_for_local_port.bash 8900 40 && npm run ft_test:api:routes
-        - CI=true BACKBEAT_CONFIG_FILE=tests/config.json npm start & bash tests/utils/wait_for_local_port.bash 8900 40 && BACKBEAT_CONFIG_FILE=tests/config.json npm run ft_test:api:retry
-        - CI=true npm run ft_test
+        - CI=true npm start & bash tests/utils/wait_for_local_port.bash 8900 40 && yarn run ft_test:api:routes
+        - CI=true BACKBEAT_CONFIG_FILE=tests/config.json npm start & bash tests/utils/wait_for_local_port.bash 8900 40 && BACKBEAT_CONFIG_FILE=tests/config.json yarn run ft_test:api:retry
+        - CI=true yarn run ft_test
diff --git a/eve/main.yml b/eve/main.yml
@@ -46,7 +46,7 @@ stages:
           haltOnFailure: True
       - ShellCommand:
           name: yarn install
-          command: rm -rf node_modules && yarn install --unsafe-perm
+          command: yarn install --frozen-lockfile
           haltOnFailure: True
       - ShellCommand:
           name: run static analysis tools on markdown

diff --git a/eve/workers/unit_and_feature_tests/pod.yml b/eve/workers/unit_and_feature_tests/pod.yml
@@ -10,10 +10,10 @@ spec:
       resources:
         requests:
           cpu: "250m"
-          memory: 1Gi
+          memory: 2Gi
         limits:
           cpu: "1"
-          memory: 1Gi
+          memory: 2Gi
       volumeMounts:
         - name: workspace
           mountPath: /home/eve/workspace

diff --git a/eve/workers/unit_and_feature_tests/run_ft_tests.bash b/eve/workers/unit_and_feature_tests/run_ft_tests.bash
@@ -18,5 +18,5 @@ killandsleep () {
   sleep 10
 }
 
-cd node_modules/@zenko/cloudserver && npm run mem_backend & bash tests/utils/wait_for_local_port.bash $PORT 40
-npm run $1
+cd node_modules/@zenko/cloudserver && yarn run mem_backend & bash tests/utils/wait_for_local_port.bash $PORT 40
+yarn run $1