X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=devops-stages%2Fstage-build.sh;h=3ac7ab606d39e51d81a3f80519a8df462314979d;hb=7e3aaf484cf189dbcff888522c7766f85e975e4a;hp=2cd46899e544fc133d9bb92c9d624e12685c2b1d;hpb=be457679612150ae0d21d10d2e1becc512f8b7b4;p=osm%2FRO.git

diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index 2cd46899..3ac7ab60 100755
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -37,14 +37,8 @@ dist_ro_vim_vmware
 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
->>>>>>> theirs
+TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST
 
 # Copying packages
 # RO plugin