projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 10960 Performance optimizations for the polling of VM status in RO
[osm/RO.git]
/
devops-stages
/
stage-build.sh
diff --git
a/devops-stages/stage-build.sh
b/devops-stages/stage-build.sh
index
2cd4689
..
8818289
100755
(executable)
--- a/
devops-stages/stage-build.sh
+++ b/
devops-stages/stage-build.sh
@@
-37,14
+37,9
@@
dist_ro_vim_vmware
dist_ro_vim_gcp"
TOX_ENV_LIST="$(echo $PACKAGES | sed "s/ /,/g")"
dist_ro_vim_gcp"
TOX_ENV_LIST="$(echo $PACKAGES | sed "s/ /,/g")"
-<<<<<<< ours
-
-TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST --parallel auto
-=======
PROCESSES=$(expr `nproc --a` / 2)
TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST --parallel $PROCESSES
PROCESSES=$(expr `nproc --a` / 2)
TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST --parallel $PROCESSES
->>>>>>> theirs
# Copying packages
# RO plugin
# Copying packages
# RO plugin