Merge branch 'master' into 338-fix_flaky_cucumbers

.travis.yml

@@ -1,13 +1,14 @@
+dist: xenial
 language: generic
-services:
-  - docker
 addons:
-  chrome: stable
   apt:
-    sources:
-      - google-chrome
     packages:
-      - google-chrome-stable
+      - libgconf-2-4
+  snaps:
+    - doctl
+    - docker
+    - chromium
+    - 'kubectl --classic'
 
 before_install:
   - yarn global add wait-on
@@ -32,6 +33,8 @@ script:
   - yarn run cypress:run --record --key $CYPRESS_TOKEN
 
 after_success:
+  - doctl auth init --access-token $DOCTL_ACCESS_TOKEN
+  - doctl kubernetes cluster kubeconfig show nitro-staging > ~/.kube/config.yaml
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
   - chmod +x send.sh
   - ./send.sh success $WEBHOOK_URL
@@ -46,9 +49,6 @@ after_failure:
   - chmod +x send.sh
   - ./send.sh failure $WEBHOOK_URL
 
-before_deploy:
-  - ./scripts/setup_kubernetes.sh
-
 deploy:
   - provider: script
     script: scripts/docker_push.sh

package.json

@@ -12,8 +12,8 @@
     "cypress:backend:seeder": "cd backend && yarn run test:before:seeder",
     "cypress:webapp": "cd webapp && cross-env GRAPHQL_URI=http://localhost:4123 yarn run dev",
     "cypress:setup": "run-p cypress:backend:* cypress:webapp",
-    "cypress:run": "cypress run --browser chrome",
-    "cypress:open": "cypress open --browser chrome"
+    "cypress:run": "cypress run --browser chromium",
+    "cypress:open": "cypress open --browser chromium"
   },
   "devDependencies": {
     "cross-env": "^5.2.0",

scripts/setup_kubernetes.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-# This script can be called multiple times for each `before_deploy` hook
-# so let's exit successfully if kubectl is already installed:
-command -v kubectl && exit 0
-
-
-openssl aes-256-cbc -K $encrypted_44f54ef0bc46_key -iv $encrypted_44f54ef0bc46_iv -in kubeconfig.yaml.enc -out kubeconfig.yaml -d
-mkdir ${HOME}/.kube
-cp kubeconfig.yaml ${HOME}/.kube/config
-
-curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
-chmod +x ./kubectl
-sudo mv ./kubectl /usr/local/bin/kubectl
-