diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-02-10 20:30:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-10 20:30:20 +0000 |
| commit | eb91c48bb99fa08acb23f2d47f7962ce8a8352e2 (patch) | |
| tree | e8d2db317859764d31f2e34a0c344753fc467250 | |
| parent | 04928cd7f061657863a89d29cd744c29ee8aa2a3 (diff) | |
| parent | d20fdbcff79cf0c8063d770cd3c2ca9720d7f3c5 (diff) | |
Merge "Change automation to original testresults server"
| -rw-r--r-- | jjb/releng/testapi-docker-deploy.sh | 6 | ||||
| -rw-r--r-- | utils/test/testapi/htmlize/htmlize.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jjb/releng/testapi-docker-deploy.sh b/jjb/releng/testapi-docker-deploy.sh index 04d71f76e..b4e60b09a 100644 --- a/jjb/releng/testapi-docker-deploy.sh +++ b/jjb/releng/testapi-docker-deploy.sh @@ -4,7 +4,7 @@ function check() { # Verify hosted sleep 5 - cmd=`curl -s --head --request GET http://testresults.opnfv.org/auto/swagger/spec | grep '200 OK' > /dev/null` + cmd=`curl -s --head --request GET http://testresults.opnfv.org/test/swagger/spec | grep '200 OK' > /dev/null` rc=$? echo $rc @@ -63,7 +63,7 @@ else fi echo "Running a container with the new image" -sudo docker run -dti -p "8711:8000" -e "mongodb_url=mongodb://172.17.0.1:27017" -e "swagger_url=http://testresults.opnfv.org/auto" opnfv/testapi:latest +sudo docker run -dti -p "8082:8000" -e "mongodb_url=mongodb://172.17.0.1:27017" -e "swagger_url=http://testresults.opnfv.org/test" opnfv/testapi:latest if check; then echo "TestResults Hosted." @@ -71,7 +71,7 @@ else echo "TestResults Hosting Failed" if [[ $(sudo docker images | grep "opnfv/testapi" | grep "old" | awk '{print $3}') ]]; then echo "Running old Image" - sudo docker run -dti -p "8711:8000" -e "mongodb_url=mongodb://172.17.0.1:27017" -e "swagger_url=http://testresults.opnfv.org/auto" opnfv/testapi:old + sudo docker run -dti -p "8082:8000" -e "mongodb_url=mongodb://172.17.0.1:27017" -e "swagger_url=http://testresults.opnfv.org/test" opnfv/testapi:old exit 1 fi fi diff --git a/utils/test/testapi/htmlize/htmlize.py b/utils/test/testapi/htmlize/htmlize.py index 70976d2bc..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://testresults.opnfv.org/auto/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://testresults.opnfv.org/auto/swagger/spec', + default='http://testresults.opnfv.org/test/swagger/spec', help='API Declaration Spec File') parser.add_argument('-o', '--output-directory', required=True, |