]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #29101 from valentinbajrami/master
authorRicardo Marques <14297426+ricardoasmarques@users.noreply.github.com>
Fri, 19 Jul 2019 14:48:01 +0000 (15:48 +0100)
committerGitHub <noreply@github.com>
Fri, 19 Jul 2019 14:48:01 +0000 (15:48 +0100)
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>
1  2 
src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh

index 9fbb5c44c1cef947f497e460fa09818b043b1abf,07062aaaadc1fffd798c39cd2426cc4a39f73069..313cd392ba4d47b4ae13754b63a4508518174eac
@@@ -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