summaryrefslogtreecommitdiffstats
path: root/jjb/vvp
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-02-28 21:57:28 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-28 21:57:28 +0000
commitb019d89f596bd66cc09d35e450e76e0ca2ba1aa8 (patch)
treeab8553b8d25b126cfa716f1dc05c15e030c222bc /jjb/vvp
parent162281c136c50e5d4a45b95842921ab5675bb076 (diff)
parent03129589d4d4f67e74f44e54b97171b2539f1835 (diff)
Merge "VNFRQTS - Update job to upload artifacts"
Diffstat (limited to 'jjb/vvp')
-rw-r--r--jjb/vvp/build-csv.sh8
-rw-r--r--jjb/vvp/pre-build-csv.sh11
-rw-r--r--jjb/vvp/vvp-validation-scripts.yaml6
3 files changed, 15 insertions, 10 deletions
diff --git a/jjb/vvp/build-csv.sh b/jjb/vvp/build-csv.sh
deleted file mode 100644
index 7c379128b..000000000
--- a/jjb/vvp/build-csv.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-virtualenv -p python3 $WORKSPACE/venv-tox
-source $WORKSPACE/venv-tox/bin/activate
-pip3 install --upgrade pip
-pip3 install --no-use-pep517 -r requirements.txt
-ls
-cd ice_validator/
-pytest --self-test tests/
diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh
new file mode 100644
index 000000000..b90f77b86
--- /dev/null
+++ b/jjb/vvp/pre-build-csv.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+virtualenv -p python3 $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."
+cd ice_validator/
+pytest --self-test tests/ \ No newline at end of file
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 9baec8582..cea59c11c 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -44,5 +44,7 @@
branch: 'master'
jobs:
- '{project-name}-{stream}-build-and-upload':
- script:
- !include-raw-escape: 'build-csv.sh'
+ pre_script: !include-raw-escape: pre-build-csv.sh
+ artifact_name: tracability.csv rst.csv
+ project_id: org.onap.vvp.validation.scripts
+ post_script: !include-raw-escape: ../vnfrqts/post-upload-artifact.sh