summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrohitsakala <rohitsakala@gmail.com>2017-01-21 15:43:35 +0530
committerRohit Sakala <rohitsakala@gmail.com>2017-01-21 14:32:31 +0000
commit31c0fb20a9e8f7ace46a1ff3db0d9a85b93c835d (patch)
treef464df9dacd758d01fe3f88ba7e39fd30c29c1e8
parent7099de10678c347a91cd535aae08f2053d446574 (diff)
Remove start and finish builders from jenkins job
Removing those builders as it is unnecessary to start and finish server instead calling testresults.opnfv.org for specs. JIRA: FUNCTEST-705 Change-Id: Icfbce0c0eaf9d4ca20920de78450a1ffd580344c Signed-off-by: rohitsakala <rohitsakala@gmail.com>
-rw-r--r--testapi/htmlize/doc-build.sh10
-rw-r--r--testapi/htmlize/finish.sh15
-rw-r--r--testapi/htmlize/htmlize.py4
-rw-r--r--testapi/htmlize/prepare.sh25
4 files changed, 12 insertions, 42 deletions
diff --git a/testapi/htmlize/doc-build.sh b/testapi/htmlize/doc-build.sh
index 427b437..33560ce 100644
--- a/testapi/htmlize/doc-build.sh
+++ b/testapi/htmlize/doc-build.sh
@@ -3,8 +3,18 @@
set -o errexit
# Create virtual environment
+virtualenv $WORKSPACE/testapi_venv
source $WORKSPACE/testapi_venv/bin/activate
+# Swgger Codegen Tool
+url="http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.1/swagger-codegen-cli-2.2.1.jar"
+
+# Check for jar file locally and in the repo
+if [ ! -f swagger-codegen-cli.jar ];
+then
+ wget http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.1/swagger-codegen-cli-2.2.1.jar -O swagger-codegen-cli.jar
+fi
+
# Install Pre-requistics
pip install requests
diff --git a/testapi/htmlize/finish.sh b/testapi/htmlize/finish.sh
deleted file mode 100644
index dc3aa86..0000000
--- a/testapi/htmlize/finish.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Stop opnfv-testapi server
-proc_number=`ps -ef | grep opnfv-testapi | grep -v grep | wc -l`
-
-if [ $proc_number -gt 0 ]; then
- procs=`ps -ef | grep opnfv-testapi | grep -v grep`
- echo "Kill opnfv-testapi server $procs"
- ps -ef | grep opnfv-testapi | grep -v grep | awk '{print $2}' | xargs kill -kill &>/dev/null
-fi
diff --git a/testapi/htmlize/htmlize.py b/testapi/htmlize/htmlize.py
index c07f98e..075e31f 100644
--- a/testapi/htmlize/htmlize.py
+++ b/testapi/htmlize/htmlize.py
@@ -39,12 +39,12 @@ if __name__ == '__main__':
parser.add_argument('-ru', '--resource-listing-url',
type=str,
required=False,
- default='http://localhost:8000/swagger/spec.json',
+ default='http://testresults.opnfv.org/test/swagger/spec.json',
help='Resource Listing Spec File')
parser.add_argument('-au', '--api-declaration-url',
type=str,
required=False,
- default='http://localhost:8000/swagger/spec',
+ default='http://testresults.opnfv.org/test/swagger/spec',
help='API Declaration Spec File')
parser.add_argument('-o', '--output-directory',
required=True,
diff --git a/testapi/htmlize/prepare.sh b/testapi/htmlize/prepare.sh
deleted file mode 100644
index e79ac56..0000000
--- a/testapi/htmlize/prepare.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-#Creating virtual environment
-virtualenv testapi_venv
-source testapi_venv/bin/activate
-
-# Swgger Codegen Tool
-url="http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.1/swagger-codegen-cli-2.2.1.jar"
-
-#Check for jar file locally and in the repo
-if [ ! -f swagger-codegen-cli.jar ];
-then
- wget http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.1/swagger-codegen-cli-2.2.1.jar -O swagger-codegen-cli.jar
-fi
-
-# Start OPNFV Test API Server
-cd utils/test/testapi/
-pip install -r requirements.txt
-./install.sh
-opnfv-testapi -c ../../../testapi_venv/etc/opnfv_testapi/config.ini &