Fix documentation generation in vnfsdk upload docs job

Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I4d8f26d771172404395af38cfee5e4784d3d3a68
Issue-ID: VNFSDK-696

diff --git a/jjb/vnfsdk/generate-dosc.sh b/jjb/vnfsdk/generate-dosc.sh
index 96ce897..06b00ab 100644 (file)
--- a/jjb/vnfsdk/generate-dosc.sh
+++ b/jjb/vnfsdk/generate-dosc.sh
@@ -1,3 +1,11 @@
 #!/bin/bash
 
-mvn clean install -DskipDocsGeneration=false
+cd $WORKSPACE/csarvalidation/python/
+virtualenv -p python3 ./venv
+source ./venv/bin/activate
+pip install --upgrade pip
+pip install -r ./requirements.txt
+
+cd ./main
+export OUTPUT_DIRECTORY="$WORKSPACE/generated/active-validation-rules/Honolulu/"
+python3 ./generate_active_validation_rules_table.py

diff --git a/jjb/vnfsdk/upload-artifact.sh b/jjb/vnfsdk/upload-artifact.sh
index a307ad6..3e07fd5 100644 (file)
--- a/jjb/vnfsdk/upload-artifact.sh
+++ b/jjb/vnfsdk/upload-artifact.sh
@@ -5,7 +5,7 @@ then
     echo "ERROR: NO PROJECT ID ENTERED"
     exit 1
 else
-    cd $WORKSPACE/csarvalidation/target/generated-docs/Honolulu
+    cd $WORKSPACE/generated/active-validation-rules/Honolulu/
     for file in *.csv ; do
         echo "-n --upload-file $file https://nexus.onap.org/content/sites/raw/$PROJECT_ID/Honolulu/$file"
         curl -n --upload-file "$file" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/Honolulu/$file"