VVP - Updating jenkins jobs to use python3

Need to update the jenkins jobs that build and upload artifacts
to python 3 to run properly.

Issue-ID: VVP-363

Signed-off-by: Hagop Bozawglanian <hagop.bozawglanian@att.com>
Change-Id: I61e8cae5e929d1bd4adebeb0e2d79544889231f2

diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh
index b90f77b..09b1278 100644 (file)
--- a/jjb/vvp/pre-build-csv.sh
+++ b/jjb/vvp/pre-build-csv.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-virtualenv -p python3 $WORKSPACE/venv-tox
+virtualenv -p python3.6 $WORKSPACE/venv-tox
 source $WORKSPACE/venv-tox/bin/activate
 pip3 install --upgrade pip
 pip3 install --no-use-pep517 -r requirements.txt
 ls
-wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json"
-echo "Copied newest needs."
+wget -O docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1
 cd ice_validator/
 pytest --self-test tests/
\ No newline at end of file