summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/releng/testapi-automate.yml2
-rw-r--r--utils/test/testapi/htmlize/doc-build.sh9
-rw-r--r--utils/test/testapi/htmlize/finish.sh2
-rw-r--r--utils/test/testapi/htmlize/prepare.sh3
-rw-r--r--utils/test/testapi/htmlize/push-doc-artifact.sh6
5 files changed, 14 insertions, 8 deletions
diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml
index 2a2f7b6d4..0566c3fd6 100644
--- a/jjb/releng/testapi-automate.yml
+++ b/jjb/releng/testapi-automate.yml
@@ -52,7 +52,7 @@
name: testapi-doc-build
builders:
- shell: |
- python ./utils/test/testapi/htmlize/htmlize.py -o ${WORKSPACE}/
+ bash ./utils/test/testapi/htmlize/doc-build.sh
- builder:
name: start-testapi-server
diff --git a/utils/test/testapi/htmlize/doc-build.sh b/utils/test/testapi/htmlize/doc-build.sh
new file mode 100644
index 000000000..e492c97b5
--- /dev/null
+++ b/utils/test/testapi/htmlize/doc-build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Create virtual environment
+source $WORKSPACE/testapi_venv/bin/activate
+
+# Install Pre-requistics
+pip install requests
+
+python ./utils/test/testapi/htmlize/htmlize.py -o ${WORKSPACE}/
diff --git a/utils/test/testapi/htmlize/finish.sh b/utils/test/testapi/htmlize/finish.sh
index d24ae056c..dc3aa868b 100644
--- a/utils/test/testapi/htmlize/finish.sh
+++ b/utils/test/testapi/htmlize/finish.sh
@@ -13,5 +13,3 @@ if [ $proc_number -gt 0 ]; then
echo "Kill opnfv-testapi server $procs"
ps -ef | grep opnfv-testapi | grep -v grep | awk '{print $2}' | xargs kill -kill &>/dev/null
fi
-
-deactivate
diff --git a/utils/test/testapi/htmlize/prepare.sh b/utils/test/testapi/htmlize/prepare.sh
index 67158f211..e79ac5693 100644
--- a/utils/test/testapi/htmlize/prepare.sh
+++ b/utils/test/testapi/htmlize/prepare.sh
@@ -9,9 +9,6 @@
virtualenv testapi_venv
source testapi_venv/bin/activate
-# Install Pre-requisites
-pip install requests
-
# Swgger Codegen Tool
url="http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.1/swagger-codegen-cli-2.2.1.jar"
diff --git a/utils/test/testapi/htmlize/push-doc-artifact.sh b/utils/test/testapi/htmlize/push-doc-artifact.sh
index 383565df1..4cf1988b0 100644
--- a/utils/test/testapi/htmlize/push-doc-artifact.sh
+++ b/utils/test/testapi/htmlize/push-doc-artifact.sh
@@ -7,19 +7,21 @@ export PATH=$PATH:/usr/local/bin/
project=$PROJECT
workspace=$WORKSPACE
-artifact_dir="functest/docs"
+artifact_dir="$project/docs"
set +e
gsutil&>/dev/null
if [ $? != 0 ]; then
echo "Not possible to push results to artifact: gsutil not installed"
+ exit 1
else
gsutil ls gs://artifacts.opnfv.org/"$project"/ &>/dev/null
if [ $? != 0 ]; then
echo "Not possible to push results to artifact: gsutil not installed."
+ exit 1
else
echo "Uploading document to artifact $artifact_dir"
gsutil cp "$workspace"/index.html gs://artifacts.opnfv.org/"$artifact_dir"/testapi.html >/dev/null 2>&1
- echo "Document can be found at http://artifacts.opnfv.org/functest/docs/testapi.html"
+ echo "Document can be found at http://artifacts.opnfv.org/releng/docs/testapi.html"
fi
fi