summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2020-12-17 17:32:45 +0000
committerGerrit Code Review <gerrit@onap.org>2020-12-17 17:32:45 +0000
commitd58b6862fd16f831acc9018d2c46c3c0788bf2d2 (patch)
tree4aa1dc442ca9bdc54a68ebb3dfca9338b7b4e186
parentbc30e1968d1e8b659ebd3671249c9a13b4514a47 (diff)
parent768660df931ded9243fb67b25056d7c561d7eb3f (diff)
Merge "Fix documentation generation in vnfsdk upload docs job"
-rw-r--r--jjb/vnfsdk/generate-dosc.sh10
-rw-r--r--jjb/vnfsdk/upload-artifact.sh2
2 files changed, 10 insertions, 2 deletions
diff --git a/jjb/vnfsdk/generate-dosc.sh b/jjb/vnfsdk/generate-dosc.sh
index 96ce89728..06b00ab80 100644
--- 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 a307ad66b..3e07fd5d9 100644
--- 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"