[#261] moves scripts to .circleci folder

.circleci/config.yml

@@ -21,19 +21,19 @@ jobs:
 
       - run:
           name: update version
-          command: ./ci/update-version.sh
+          command: ./.circleci/update-version.sh
 
       - run:
           name: install node
-          command: ./ci/install-node.sh
+          command: ./.circleci/install-node.sh
 
       - run:
           name: build
           environment:
             BASH_ENV: "~/.nvm/nvm.sh"
           command: |
-            ./ci/dependencies.sh
-            ./ci/compile.sh
+            ./.circleci/dependencies.sh
+            ./.circleci/compile.sh
 
       - save_cache:
           key: v1-nevergreen-server-{{ checksum "project.clj" }}
@@ -49,7 +49,7 @@ jobs:
           name: test
           environment:
             BASH_ENV: "~/.nvm/nvm.sh"
-          command: ./ci/test.sh
+          command: ./.circleci/test.sh
 
       - store_test_results:
           path: ./target/test-reports
@@ -65,11 +65,11 @@ jobs:
           root: .
           paths:
             - ./resources/*.txt
-            - ./ci/*
+            - ./.circleci/*
             - ./target/nevergreen-standalone.jar
             - ./Dockerfile
 
-  functional-tests-cypress:
+  journey-tests:
     working_directory: ~/nevergreen
 
     docker:
@@ -94,7 +94,7 @@ jobs:
             CYPRESS_TRAY_PASSWORD: ""
         command: |
           npm install
-          npm run cypress
+          npm run test:journey
 
     - save_cache:
         key: v4-nevergreen-cypress-{{ checksum "package.json" }}
@@ -131,17 +131,17 @@ jobs:
 
       - run:
           name: export version
-          command: ./ci/export-version.sh
+          command: ./.circleci/export-version.sh
 
       - run:
           name: deploy staging
-          command: ./ci/deploy.sh
+          command: ./.circleci/deploy.sh
 
       - run:
           name: smoke test
           environment:
             HOST: "https://staging.nevergreen.io"
-          command: ./ci/smoke-test.sh
+          command: ./.circleci/smoke-test.sh
 
       - run:
           name: create docker image
@@ -178,17 +178,17 @@ jobs:
 
       - run:
           name: export version
-          command: ./ci/export-version.sh
+          command: ./.circleci/export-version.sh
 
       - run:
           name: deploy production
-          command: ./ci/release.sh
+          command: ./.circleci/release.sh
 
       - run:
           name: smoke test
           environment:
             HOST: "https://nevergreen.io"
-          command: ./ci/smoke-test.sh
+          command: ./.circleci/smoke-test.sh
 
       - run:
           name: create docker image
@@ -200,11 +200,11 @@ jobs:
 
       - run:
           name: create release on GitHub
-          command: ./ci/release-github.sh
+          command: ./.circleci/release-github.sh
 
       - run:
           name: tweet release
-          command: ./ci/release-tweet.sh
+          command: ./.circleci/release-tweet.sh
 
 workflows:
   version: 2
@@ -214,13 +214,13 @@ workflows:
       - deploy-staging:
           requires:
             - build
-      - functional-tests-cypress:
+      - journey-tests:
           requires:
             - deploy-staging
       - hold:
           type: approval
           requires:
-            - functional-tests-cypress
+            - journey-tests
       - deploy-prod:
           requires:
             - hold

develop.sh

@@ -31,7 +31,7 @@ echo "clean"
 npm run clean
 
 echo "fetching node modules and performing first build"
-. ./ci/dependencies.sh
+. ./.circleci/dependencies.sh
 
 echo "watching the js for changes ..."
 npm run watch:js &

package.json

@@ -22,6 +22,7 @@
     "build:schema-validator": "ajv compile -s src/client/reducers/schema.json -o src/client/reducers/ValidateConfiguration.js --remove-additional --all-errors",
     "test": "NODE_ENV=dev mocha --require @babel/polyfill --require ./test/client/Setup.js --require @babel/register -R mocha-circleci-reporter --reporter-options mochaFile=./target/client/test-results.xml --recursive test/client",
     "test:coverage": "nyc --reporter=html npm test",
+    "test:journey": "npm run cypress",
     "lint": "npm run lint:js && npm run lint:css",
     "lint:js": "eslint ./src/client ./test/client",
     "lint:css": "stylelint \"src/client/**/*.scss\" --syntax scss",

pre-push.sh

@@ -20,28 +20,24 @@ pkill -SIGINT -f ./develop.sh
 set -e
 
 echo '[Step 2 of 6] Running the ci dependencies script...'
-. ./ci/dependencies.sh
+. ./.circleci/dependencies.sh
 
 echo '[Step 3 of 6] Running the ci compile script...'
-. ./ci/compile.sh
+. ./.circleci/compile.sh
 
 echo '[Step 4 of 6] Running the ci test script...'
-. ./ci/test.sh
+. ./.circleci/test.sh
 
 echo '[Step 5 of 6] Starting the server...'
 ./lein.sh run &
 npm run start:ci-stub-server &
 
 export HOST="http://localhost:5000"
 export FULL_VERSION="$(cat "./resources/version.txt")+$(cat "./resources/version_meta.txt")"
-./ci/smoke-test.sh # Don't source as the script calls exit
+./.circleci/smoke-test.sh # Don't source as the script calls exit
 
-echo '[Step 6 of 6] Running the functional tests...'
-. ./ci/functional-test.sh
-
-# uncomment to also run the functional tests in Firefox
-# export BROWSER=firefox
-# ./lein.sh test functional.functional-test
+echo '[Step 6 of 6] Running the journey tests...'
+npm run test:journey
 
 echo
 echo 'Everything completed successfully, push away!'