From 03129589d4d4f67e74f44e54b97171b2539f1835 Mon Sep 17 00:00:00 2001
From: Hagop Bozawglanian <hagop.bozawglanian@att.com>
Date: Thu, 28 Feb 2019 19:09:30 +0000
Subject: [PATCH] VNFRQTS - Update job to upload artifacts

Update the post script to curl raw artifacts
based on the number passed in to work for
VNFRQTS and VVP.

Change-Id: Iefd4e0e5069c2917952072dbf5e26433495fd25f
Issue-ID: VNFRQTS-539
Signed-off-by: Hagop Bozawglanian <hagop.bozawglanian@att.com>
---
 jjb/vnfrqts/post-upload-artifact.sh | 21 ++++++++++++++++++---
 jjb/vvp/build-csv.sh                |  8 --------
 jjb/vvp/pre-build-csv.sh            | 11 +++++++++++
 jjb/vvp/vvp-validation-scripts.yaml |  6 ++++--
 4 files changed, 33 insertions(+), 13 deletions(-)
 delete mode 100644 jjb/vvp/build-csv.sh
 create mode 100644 jjb/vvp/pre-build-csv.sh

diff --git a/jjb/vnfrqts/post-upload-artifact.sh b/jjb/vnfrqts/post-upload-artifact.sh
index 2de1f4d8c..588e49b04 100644
--- a/jjb/vnfrqts/post-upload-artifact.sh
+++ b/jjb/vnfrqts/post-upload-artifact.sh
@@ -1,6 +1,21 @@
 #!/bin/bash
 
 set -e -o pipefail
-cd $WORKSPACE/docs/data
-echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
-curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
\ No newline at end of file
+set -- $ARTIFACT_NAME
+if [ -z "$ARTIFACT_NAME" ]
+then
+    echo "ERROR NO ARTIFACTS ENTERED"
+else
+    if [ -z "$2" ]
+    then
+        cd $WORKSPACE/docs/data
+        echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
+        curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
+    else
+        cd $WORKSPACE/ice_validator/output
+        echo "-n --upload-file $1 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1"
+        curl -n --upload-file "$1" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1"
+        echo "-n --upload-file $2 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2"
+        curl -n --upload-file "$2" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2"
+    fi
+fi
\ No newline at end of file
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
-- 
2.16.6