diff options
| -rw-r--r-- | jjb/releng/testapi-automate.yml | 16 | ||||
| -rw-r--r-- | utils/test/testapi/htmlize/doc-build.sh | 10 | ||||
| -rw-r--r-- | utils/test/testapi/htmlize/finish.sh | 15 | ||||
| -rw-r--r-- | utils/test/testapi/htmlize/htmlize.py | 4 | ||||
| -rw-r--r-- | utils/test/testapi/htmlize/prepare.sh | 25 |
5 files changed, 13 insertions, 57 deletions
diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml index c03835279..be5062e92 100644 --- a/jjb/releng/testapi-automate.yml +++ b/jjb/releng/testapi-automate.yml @@ -21,7 +21,7 @@ - 'opnfv-build-ubuntu-defaults' scm: - - git-scm + - git-scm-gerrit triggers: - gerrit: @@ -85,10 +85,8 @@ builders: - docker-update - - start-testapi-server - testapi-doc-build - upload-doc-artifact - - clean-testapi-server ################################ # job builders @@ -107,12 +105,6 @@ bash ./jjb/releng/testapi-docker-update.sh - builder: - name: start-testapi-server - builders: - - shell: | - bash ./utils/test/testapi/htmlize/prepare.sh - -- builder: name: testapi-doc-build builders: - shell: | @@ -123,9 +115,3 @@ builders: - shell: | bash ./utils/test/testapi/htmlize/push-doc-artifact.sh - -- builder: - name: clean-testapi-server - builders: - - shell: | - bash ./utils/test/testapi/htmlize/finish.sh diff --git a/utils/test/testapi/htmlize/doc-build.sh b/utils/test/testapi/htmlize/doc-build.sh index 427b4378b..33560ceea 100644 --- a/utils/test/testapi/htmlize/doc-build.sh +++ b/utils/test/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/utils/test/testapi/htmlize/finish.sh b/utils/test/testapi/htmlize/finish.sh deleted file mode 100644 index dc3aa868b..000000000 --- a/utils/test/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/utils/test/testapi/htmlize/htmlize.py b/utils/test/testapi/htmlize/htmlize.py index c07f98ecf..075e31f79 100644 --- a/utils/test/testapi/htmlize/htmlize.py +++ b/utils/test/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/utils/test/testapi/htmlize/prepare.sh b/utils/test/testapi/htmlize/prepare.sh deleted file mode 100644 index e79ac5693..000000000 --- a/utils/test/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 & |