[SEBA-496]
Update pip packages used in XOS containers, flatten containers
Fixed invalid YAML generated by xosgenx modeldefs.xtarget
Change-Id: Ic051170f3f9ef5a5d0dbba61aa6843458a435d49
diff --git a/scripts/setup_venv.sh b/scripts/setup_venv.sh
index 85955a1..dba8b15 100755
--- a/scripts/setup_venv.sh
+++ b/scripts/setup_venv.sh
@@ -21,7 +21,7 @@
WORKSPACE=${WORKSPACE:-.}
XOS_DIR=${XOS_DIR:-.}
-PIP_REQS=${PIP_REQS:-${XOS_DIR}/scripts/xos_dev_reqs.txt}
+PIP_REQS=${PIP_REQS:-${XOS_DIR}/containers/xos/requirements.txt}
VENVDIR="${WORKSPACE}/venv-xos"
# create venv if it's not yet there
@@ -34,7 +34,7 @@
echo "Installing python requirements in virtualenv with pip"
source "${VENVDIR}/bin/activate"
pip install --upgrade pip
-pip install -r "$PIP_REQS"
+pip install -r "$PIP_REQS" nose2 mock
pushd "$XOS_DIR/lib/xos-util"
python setup.py install