Merge branch '10312-nodemanager-quotas' refs #10312
authorPeter Amstutz <peter.amstutz@curoverse.com>
Sat, 10 Jun 2017 01:29:59 +0000 (21:29 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Sat, 10 Jun 2017 01:29:59 +0000 (21:29 -0400)
1  2 
build/run-tests.sh

diff --combined build/run-tests.sh
index dffbe32e8ab9c89d6cecf02dd445c8314d2560ad,de29db67e83f38705730cb6b51bd8bcd5e23c707..352d05b945ea168fb0700614c9327bfd1e3fa033
@@@ -78,6 -78,7 +78,7 @@@ services/keepstor
  services/keep-balance
  services/login-sync
  services/nodemanager
+ services/nodemanager-integration
  services/crunch-run
  services/crunch-dispatch-local
  services/crunch-dispatch-slurm
@@@ -567,7 -568,7 +568,7 @@@ do_test_once() 
          # mode makes Go show the wrong line numbers when reporting
          # compilation errors.
          go get -t "git.curoverse.com/arvados.git/$1" && \
 -            cd "$WORKSPACE/$1" && \
 +            cd "$GOPATH/src/git.curoverse.com/arvados.git/$1" && \
              [[ -z "$(gofmt -e -d . | tee /dev/stderr)" ]] && \
              if [[ -n "${testargs[$1]}" ]]
          then
@@@ -854,6 -855,12 +855,12 @@@ test_login-sync() 
  }
  do_test services/login-sync login-sync
  
+ test_nodemanager-integration() {
+     cd "$WORKSPACE/services/nodemanager" \
+         && tests/integration_test.py ${testargs[services/nodemanager-integration]}
+ }
+ do_test services/nodemanager-integration nodemanager-integration
  for p in "${pythonstuff[@]}"
  do
      dir=${p%:py3}