From cc9f6c7707329d4993f1c73aa28786e6b30f33d9 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Wed, 8 Aug 2018 17:46:32 +0700
Subject: [PATCH 01/23] test:e2e test and configuration

---
 .travis.yml         | 23 +++++++++++++++--------
 e2e/app.e2e-spec.ts |  6 ++++--
 e2e/app.po.ts       |  6 +++---
 package.json        |  4 +++-
 protractor.conf.js  |  2 +-
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 925b77ea8f..61e8bb68b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,11 +34,18 @@ before_install:
  - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
  - sudo dpkg -i google-chrome*.deb
 
-before_deploy:
-  - docker build -t ${DOCKER_USER}/${DOCKER_REPO} .
-
-deploy:
-  - provider: script
-    script: ./scripts/publish-docker-image.sh
-    on:
-      all_branches: true
+before_script:
+ - docker pull cloudstack/simulator
+ - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
+ - sleep 60
+ - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
+ - docker stop cloudstack-simulator-e2e
+
+script:
+ - yarn e2e
+
+
+
+
+
+
diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts
index 1c6c1b6c1f..53904914a2 100644
--- a/e2e/app.e2e-spec.ts
+++ b/e2e/app.e2e-spec.ts
@@ -1,4 +1,5 @@
 import { CloudstackUiPage } from './app.po';
+import {browser} from 'protractor';
 
 describe('cloudstack-ui App', () => {
   let page: CloudstackUiPage;
@@ -7,8 +8,9 @@ describe('cloudstack-ui App', () => {
     page = new CloudstackUiPage();
   });
 
-  it('should display welcome message', () => {
+  it('should display logo', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!!');
+    browser.waitForAngular();
+    expect(page.getLogo().isPresent()).toBeTruthy();
   });
 });
diff --git a/e2e/app.po.ts b/e2e/app.po.ts
index 82ae9600a9..9735b7e46a 100644
--- a/e2e/app.po.ts
+++ b/e2e/app.po.ts
@@ -2,10 +2,10 @@ import { browser, by, element } from 'protractor';
 
 export class CloudstackUiPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get('/bwsw/master/login');
   }
 
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+  getLogo() {
+    return element(by.css('.logo'));
   }
 }
diff --git a/package.json b/package.json
index 216991ef77..026960c7b6 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
     "lint": "ng lint",
     "lint:report": "mkdir -p reports; ng lint -t checkstyle > reports/checkstyle-result.xml",
     "e2e": "ng e2e",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
+    "ci": "npm run lint && npm run test && npm run e2e"
+
   },
   "private": true,
   "dependencies": {
diff --git a/protractor.conf.js b/protractor.conf.js
index 7ee3b5ee86..6822fd4f0d 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -12,7 +12,7 @@ exports.config = {
     'browserName': 'chrome'
   },
   directConnect: true,
-  baseUrl: 'http://localhost:4200/',
+  baseUrl: 'http://cs-ui-ci.bitworks.software:8080',
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,

From 18458035de1226dd456e049cc4f5c8183ab52b1f Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Wed, 8 Aug 2018 17:53:01 +0700
Subject: [PATCH 02/23] test: 50 sec

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 61e8bb68b4..76d708ee7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ before_install:
 before_script:
  - docker pull cloudstack/simulator
  - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
- - sleep 60
+ - sleep 50
  - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
  - docker stop cloudstack-simulator-e2e
 

From 8b7bb0f7cb406e2b135f79a80db80183e62643d9 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Thu, 9 Aug 2018 10:48:57 +0700
Subject: [PATCH 03/23] test: travis

---
 .travis.yml | 51 ---------------------------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 76d708ee7a..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-sudo: true
-dist: trusty
-
-language: node_js
-node_js:
-  - '8'
-
-services:
-  - docker
-
-branches:
-  only:
-  - master
-  - /^\d+\.\d+\.\d+$/
-
-cache: yarn
-
-addons:
-  apt:
-    packages:
-      - docker-ce
-
-env:
-  global:
-    - DOCKER_USER=bwsw
-    - DOCKER_REPO=cloudstack-ui
-
-before_install:
- - export CHROME_BIN=/usr/bin/google-chrome
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
- - sudo apt-get update
- - sudo apt-get install -y libappindicator1 fonts-liberation
- - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- - sudo dpkg -i google-chrome*.deb
-
-before_script:
- - docker pull cloudstack/simulator
- - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
- - sleep 50
- - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
- - docker stop cloudstack-simulator-e2e
-
-script:
- - yarn e2e
-
-
-
-
-
-

From 2234822efc719296a6ffb9ef14950fa3e595d934 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Thu, 9 Aug 2018 10:49:52 +0700
Subject: [PATCH 04/23] test: travis

---
 .travis.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..12b3bbcee8
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,45 @@
+sudo: true
+dist: trusty
+
+language: node_js
+node_js:
+  - '8'
+
+services:
+  - docker
+
+branches:
+  only:
+  - master
+  - /^\d+\.\d+\.\d+$/
+
+cache: yarn
+
+addons:
+  apt:
+    packages:
+      - docker-ce
+
+env:
+  global:
+    - DOCKER_USER=bwsw
+    - DOCKER_REPO=cloudstack-ui
+
+before_install:
+ - export CHROME_BIN=/usr/bin/google-chrome
+ - export DISPLAY=:99.0
+ - sh -e /etc/init.d/xvfb start
+ - sudo apt-get update
+ - sudo apt-get install -y libappindicator1 fonts-liberation
+ - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+ - sudo dpkg -i google-chrome*.deb
+
+before_script:
+ - docker pull cloudstack/simulator
+ - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
+ - sleep 50
+ - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
+ - docker stop cloudstack-simulator-e2e
+
+script:
+ - yarn e2e

From c025d1c726ef20abc8eb0606c5b76b3ca0ee53fc Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Thu, 9 Aug 2018 14:01:15 +0700
Subject: [PATCH 05/23] test: conf file

---
 protractor.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protractor.conf.js b/protractor.conf.js
index 6822fd4f0d..78badcf29c 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -12,7 +12,7 @@ exports.config = {
     'browserName': 'chrome'
   },
   directConnect: true,
-  baseUrl: 'http://cs-ui-ci.bitworks.software:8080',
+  baseUrl: 'http://localhost:49152',
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,

From 0b56f9df75a362b6b9e50ba5e8603a333b0f9fa3 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Thu, 9 Aug 2018 14:57:00 +0700
Subject: [PATCH 06/23] test: e2e serve false

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 12b3bbcee8..6987ba719d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,8 +38,10 @@ before_script:
  - docker pull cloudstack/simulator
  - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
  - sleep 50
- - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
+ - docker exec -ti cloudstack-simulator-e2e python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/basic.cfg
+ - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e --serve false"
  - docker stop cloudstack-simulator-e2e
 
 script:
  - yarn e2e
+

From 615a45f9683c5d1f26597148d933e0fa0e170954 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Thu, 9 Aug 2018 15:39:13 +0700
Subject: [PATCH 07/23] test: e2e

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6987ba719d..10131cb764 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,10 @@ before_install:
 before_script:
  - docker pull cloudstack/simulator
  - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
- - sleep 50
+ - sleep 120
  - docker exec -ti cloudstack-simulator-e2e python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/basic.cfg
- - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e --serve false"
+ - echo $CONFIG > ./workspace/proxy-conf.js
+ - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
  - docker stop cloudstack-simulator-e2e
 
 script:

From bcff911d461962de9c4c9e1b88659a8c68fae845 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 11:18:30 +0700
Subject: [PATCH 08/23] test: e2e

---
 .travis.yml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 10131cb764..ab152e5905 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,34 +15,12 @@ branches:
 
 cache: yarn
 
-addons:
-  apt:
-    packages:
-      - docker-ce
 
 env:
   global:
     - DOCKER_USER=bwsw
     - DOCKER_REPO=cloudstack-ui
 
-before_install:
- - export CHROME_BIN=/usr/bin/google-chrome
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
- - sudo apt-get update
- - sudo apt-get install -y libappindicator1 fonts-liberation
- - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- - sudo dpkg -i google-chrome*.deb
-
-before_script:
- - docker pull cloudstack/simulator
- - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
- - sleep 120
- - docker exec -ti cloudstack-simulator-e2e python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/basic.cfg
- - echo $CONFIG > ./workspace/proxy-conf.js
- - docker run --rm -v $(pwd):/workspace -e "CLIENT_ENDPOINT=http://127.0.0.1:4201/client" -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
- - docker stop cloudstack-simulator-e2e
-
 script:
- - yarn e2e
+ - ls
 

From 7d5de1d460874a0f1a4c998078864d73a5aa6004 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 11:27:35 +0700
Subject: [PATCH 09/23] test: e2e

---
 .travis.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ab152e5905..01ba2d29e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,34 @@ branches:
 
 cache: yarn
 
+addons:
+  apt:
+    packages:
+      - docker-ce
 
 env:
   global:
     - DOCKER_USER=bwsw
     - DOCKER_REPO=cloudstack-ui
 
+before_install:
+ - export CHROME_BIN=/usr/bin/google-chrome
+ - export DISPLAY=:99.0
+ - sh -e /etc/init.d/xvfb start
+ - sudo apt-get update
+ - sudo apt-get install -y libappindicator1 fonts-liberation
+ - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+ - sudo dpkg -i google-chrome*.deb
+
+before_script:
+ - docker pull cloudstack/simulator
+ - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
+ - sleep 180
+ - docker exec -ti cloudstack-simulator-e2e python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/basic.cfg
+ - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
+ - docker run --rm -v $(pwd):/workspace -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
+ - docker stop cloudstack-simulator-e2e
+
 script:
- - ls
+ - yarn e2e
 

From 9af68624e4e35c51ba2473aa43c0f3b38064a6d1 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 11:36:19 +0700
Subject: [PATCH 10/23] test: e2e

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01ba2d29e5..219c119d18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,11 +35,11 @@ before_install:
  - sudo dpkg -i google-chrome*.deb
 
 before_script:
+ - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
  - docker pull cloudstack/simulator
  - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
- - sleep 180
+ - bash -c 'for i in $(seq 1 50); do TEST_PORT=$(curl --silent 127.0.0.1:4201 | grep HTML); if [ ! -z "$TEST_PORT" ]; then exit 0; fi; echo "5 sec timeout for retry ($i/25) ..."; sleep 5; done'
  - docker exec -ti cloudstack-simulator-e2e python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/basic.cfg
- - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
  - docker run --rm -v $(pwd):/workspace -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
  - docker stop cloudstack-simulator-e2e
 

From 3bd8c82e5a1724a6b31ce89f38388de601bd6270 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 11:51:00 +0700
Subject: [PATCH 11/23] test: e2e

---
 .travis.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 219c119d18..c199b374d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,21 +25,9 @@ env:
     - DOCKER_USER=bwsw
     - DOCKER_REPO=cloudstack-ui
 
-before_install:
- - export CHROME_BIN=/usr/bin/google-chrome
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
- - sudo apt-get update
- - sudo apt-get install -y libappindicator1 fonts-liberation
- - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- - sudo dpkg -i google-chrome*.deb
 
 before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
- - docker pull cloudstack/simulator
- - docker run --name cloudstack-simulator-e2e -d --rm -p 4201:8080 cloudstack/simulator
- - bash -c 'for i in $(seq 1 50); do TEST_PORT=$(curl --silent 127.0.0.1:4201 | grep HTML); if [ ! -z "$TEST_PORT" ]; then exit 0; fi; echo "5 sec timeout for retry ($i/25) ..."; sleep 5; done'
- - docker exec -ti cloudstack-simulator-e2e python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/basic.cfg
  - docker run --rm -v $(pwd):/workspace -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
  - docker stop cloudstack-simulator-e2e
 

From 48ce2c22b90f7e77b49bcd749f48644da3ddfdab Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 11:58:15 +0700
Subject: [PATCH 12/23] test: e2e

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c199b374d3..7cba3c8ecd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ env:
 
 before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
- - docker run --rm -v $(pwd):/workspace -w /workspace markadams/chromium-xvfb-js /bin/bash -ce "npm run e2e"
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce " npm install && npm run e2e"
  - docker stop cloudstack-simulator-e2e
 
 script:

From 65bc71064818dff5b471d2f3ce67a495ea957b94 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 12:06:04 +0700
Subject: [PATCH 13/23] test: e2e

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7cba3c8ecd..4ccadeea6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +25,14 @@ env:
     - DOCKER_USER=bwsw
     - DOCKER_REPO=cloudstack-ui
 
+install:
+ - yarn
 
 before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
- - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce " npm install && npm run e2e"
+ - ./node_modules/.bin/webdriver-manager clean
+ - ./node_modules/.bin/webdriver-manager update --versions.chrome 2.35
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run e2e"
  - docker stop cloudstack-simulator-e2e
 
 script:

From d0be1126dfbd65c114e0529b93cd59a107ff6a3e Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 12:16:08 +0700
Subject: [PATCH 14/23] test: e2e

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ccadeea6f..2199b321c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,9 +32,8 @@ before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
  - ./node_modules/.bin/webdriver-manager clean
  - ./node_modules/.bin/webdriver-manager update --versions.chrome 2.35
- - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run e2e"
- - docker stop cloudstack-simulator-e2e
 
 script:
- - yarn e2e
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run e2e --webdriver-update false"
+ - docker stop cloudstack-simulator-e2e
 

From 0fe8ff56eefc02aa5563083eaa44dd2f824e5882 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 12:35:29 +0700
Subject: [PATCH 15/23] test: e2e

---
 .travis.yml  | 2 +-
 package.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2199b321c3..1ebf5536f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,6 @@ before_script:
  - ./node_modules/.bin/webdriver-manager update --versions.chrome 2.35
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run e2e --webdriver-update false"
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run e2e-no-update"
  - docker stop cloudstack-simulator-e2e
 
diff --git a/package.json b/package.json
index 026960c7b6..2bb2970a0f 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "lint": "ng lint",
     "lint:report": "mkdir -p reports; ng lint -t checkstyle > reports/checkstyle-result.xml",
     "e2e": "ng e2e",
+    "e2e-no-update": "ng e2e --webdriver-update false",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "ci": "npm run lint && npm run test && npm run e2e"
 

From 938d3a2eded49a14469f561e2716bdd25750dcb3 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 12:56:05 +0700
Subject: [PATCH 16/23] test: e2e

---
 .travis.yml  | 4 +---
 package.json | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ebf5536f4..f9105158ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,8 @@ install:
 
 before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
- - ./node_modules/.bin/webdriver-manager clean
- - ./node_modules/.bin/webdriver-manager update --versions.chrome 2.35
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run e2e-no-update"
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run webdriver-clean && npm run webdriver-2.35 && npm run e2e-no-update"
  - docker stop cloudstack-simulator-e2e
 
diff --git a/package.json b/package.json
index 2bb2970a0f..8f0b7193d8 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "e2e": "ng e2e",
     "e2e-no-update": "ng e2e --webdriver-update false",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "ci": "npm run lint && npm run test && npm run e2e"
+    "webdriver-clean": "./node_modules/.bin/webdriver-manager clean",
+    "webdriver-2.35": "./node_modules/.bin/webdriver-manager update --versions.chrome 2.35"
 
   },
   "private": true,

From e3ef68ac2b2d5526e0f75055461139d8e224334f Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 14:24:10 +0700
Subject: [PATCH 17/23] test: e2e

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f9105158ac..0037d740f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,6 @@ before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm run webdriver-clean && npm run webdriver-2.35 && npm run e2e-no-update"
+ - docker run --rm -v $(pwd):/workspace -w /workspace trion/ng-cli-e2e /bin/bash -ce "npm run webdriver-clean && npm run webdriver-2.35 && npm run e2e"
  - docker stop cloudstack-simulator-e2e
 

From 4ebdf3f52dd3f92fcb9f94b7305d8af788664bf3 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 14:25:26 +0700
Subject: [PATCH 18/23] test: e2e

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0037d740f2..58acdf2618 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,6 @@ before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace trion/ng-cli-e2e /bin/bash -ce "npm run webdriver-clean && npm run webdriver-2.35 && npm run e2e"
+ - docker run --rm -v $(pwd):/workspace -w /workspace trion/ng-cli-e2e /bin/bash -ce "npm run e2e"
  - docker stop cloudstack-simulator-e2e
 

From aaa96ec19a5f0cbf9e49700feb6663830f188951 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 15:15:25 +0700
Subject: [PATCH 19/23] test: e2e

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 58acdf2618..eaac97e8d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,6 @@ before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace trion/ng-cli-e2e /bin/bash -ce "npm run e2e"
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.2 /bin/bash -ce "npm run webdriver-clean && npm run webdriver-2.35 && npm run e2e-no-update"
  - docker stop cloudstack-simulator-e2e
 

From 75186711e424651e9cda000378985377b83b7a21 Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 15:45:54 +0700
Subject: [PATCH 20/23] test: e2e

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eaac97e8d0..dd4b9f037e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,6 @@ before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.2 /bin/bash -ce "npm run webdriver-clean && npm run webdriver-2.35 && npm run e2e-no-update"
+ - docker run --rm -v $(pwd):/workspace -w /workspace rogargon/angular-e2e /bin/bash -ce "npm run e2e"
  - docker stop cloudstack-simulator-e2e
 

From e07bde89dc6e1cb79fcf512b6bb1c9ee852e467e Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 15:57:28 +0700
Subject: [PATCH 21/23] test: e2e

---
 protractor.conf.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/protractor.conf.js b/protractor.conf.js
index 78badcf29c..6354bd975b 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -9,7 +9,10 @@ exports.config = {
     './e2e/**/*.e2e-spec.ts'
   ],
   capabilities: {
-    'browserName': 'chrome'
+    'browserName': 'chrome',
+    'chromeOptions': {
+      'args': ['no-sandbox']
+    }
   },
   directConnect: true,
   baseUrl: 'http://localhost:49152',

From 169400330824298554aa2201912c6bb354f863ed Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 16:38:47 +0700
Subject: [PATCH 22/23] test: e2e

---
 .travis.yml  | 2 +-
 package.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd4b9f037e..3014b16d0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,6 @@ before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace rogargon/angular-e2e /bin/bash -ce "npm run e2e"
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm install && npm webdriver-clean && npm run webdriver-2.35 && npm run e2e"
  - docker stop cloudstack-simulator-e2e
 
diff --git a/package.json b/package.json
index 8f0b7193d8..3ea6aeb0f6 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "webdriver-clean": "./node_modules/.bin/webdriver-manager clean",
     "webdriver-2.35": "./node_modules/.bin/webdriver-manager update --versions.chrome 2.35"
-
   },
   "private": true,
   "dependencies": {

From 1795ee13aa878e6f4d78311c94b2da7712bca5bb Mon Sep 17 00:00:00 2001
From: gusarova_np <gusarova_np@bw-sw.com>
Date: Fri, 10 Aug 2018 16:46:09 +0700
Subject: [PATCH 23/23] test: e2e

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3014b16d0d..f769751068 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,6 @@ before_script:
  - echo $PROXY_CONF | base64 -d > ./proxy-conf.js
 
 script:
- - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm install && npm webdriver-clean && npm run webdriver-2.35 && npm run e2e"
+ - docker run --rm -v $(pwd):/workspace -w /workspace m7ov/node8-chrome:0.1 /bin/bash -ce "npm install && npm run webdriver-clean && npm run webdriver-2.35 && npm run e2e"
  - docker stop cloudstack-simulator-e2e