From: Ricardo Marques <14297426+ricardoasmarques@users.noreply.github.com>
Date: Fri, 19 Jul 2019 14:48:01 +0000 (+0100)
Subject: Merge pull request #29101 from valentinbajrami/master
X-Git-Tag: v15.1.0~2159
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39c8542e7a8f13c8bda30e6e72a1968a06a80f90;p=ceph.git

Merge pull request #29101 from valentinbajrami/master

mgr/dashboard: Improve e2e script

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Rafael Quintero <rquinter@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
---

39c8542e7a8f13c8bda30e6e72a1968a06a80f90
diff --cc src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
index 9fbb5c44c1ce,07062aaaadc1..313cd392ba4d
--- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
+++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
@@@ -63,12 -63,12 +63,12 @@@ cd $DASH_DIR/fronten
  jq .[].target=$BASE_URL proxy.conf.json.sample > proxy.conf.json
  
  . $BUILD_DIR/src/pybind/mgr/dashboard/node-env/bin/activate
 -npm ci
 +timeout 1h npm ci
  
- if [ $DEVICE == "chrome" ]; then
+ if [ "$DEVICE" == "chrome" ]; then
      npm run e2e || stop 1
      stop 0
- elif [ $DEVICE == "docker" ]; then
+ elif [ "$DEVICE" == "docker" ]; then
      failed=0
      docker run -d -v $(pwd):/workdir --net=host --name angular-e2e-container rogargon/angular-e2e || failed=1
      docker exec angular-e2e-container npm run e2e || failed=1