From 492b7a541d923f3bb0c99f37fb67128882a5f559 Mon Sep 17 00:00:00 2001 From: Jawad Qureshi Date: Tue, 26 May 2020 13:29:25 -0500 Subject: [PATCH] Move swagger-cli url to ENV --- .travis.yml | 1 + docker-compose-ci.yaml | 1 + tox.ini | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c96a74b25..cd3780786 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,5 +27,6 @@ jobs: env: global: + - SWAGGER_URL="https://oss.sonatype.org/content/repositories/releases/io/swagger/swagger-codegen-cli/2.3.1/swagger-codegen-cli-2.3.1.jar" - secure: "KdI8zRZjFUIahHvRqB/cOrU66kaMDc4okSdLlC9bQRYo4Z9BU2789/7TNsVQQUt7lnCNVO1L5qSbGN96TK76h7wD0w8/esmKP1qMkLuI71AXfYgKRpU+e9CBBZeeelh3uFsPjUTkbGzio3lxLzgQ1w16IfyU0DlLB4IH0gnyIjF/bQN0dxMRnl1gEXw14QfeX5YldqsnyE7Y4wMB/jS4uw02p2BpPXPcq/B/wRAoUYwDRr3EbSH3LcsM17uwhHdBOcC2cQ+yBIGwQIhgboNLLUtJKQEi9GQXgPBOV8R1ju91UU5n7WOQKDXJ+6wjlxVTqZyjxJ3UqEKGqRtYXFMV+DbGZkDLz5gKJSgq9u1qIR7M0l0A4O9plt1tbVXgXGrUeyyWGycMB309mj1CeEKyc+g9LcwiywJNxzwxJZJhUoxL4+lrQbH7O61orgC0+ZyEpdGIN2G8PMIgEtS3gdQfYyxLdnu19hlL6NGZ3uWMrZ+X0b00bmib/q08Rbbc5j2B1vDg5va0yB8q/Du4357MSMe6wljMxqQuVeZfKGslHefV3YCjekmKFC/P2vA/y627Gfsqnd2UIlChSoFkepr/kUrv3RC+TBfH2PnifUSvzSrCUftwQoSQo3oFrMfnNb1AKICA2Tgi0TDFc/F3UaWazqgyu3jU6Pqt4ctnzoazJZo=" - secure: "ViToiRS4/SvlW8DVXJxb0JA1nFfjjhWNL4n9M/q9LiZeFi5R09Zzw/vRPdaXTjunO0mhORo+jjUalC4OUkeC0Ot/RFblXzziF0imtLHJrzS37fEaXu2RiovSn2NKtE1hdER+g56Jh9WTisrEJv50M0TbCa/K/jKsnwVRv44/lAoq1PCrEfNZMlvP4kXgIbh7ddi7roT1uIifNIS+1xCktDW7sSsaz+54G6oM2THxdHd0+CbIlv2d1mABLxnOtBitvgGuXw565E3p0memXXMDZPjGeKrhtp0YoEIbOpmeGq/rj+5rhNbVbEpKpkNkgi+U9cIjiTD02JmlaVHePh9ApbLxndEkJugWZEISsx21jGOj/IpCtgcoOP6uEkkM35gpywK0e1vCnFNNmQOFAzxxdFZJpu3P606uRnhtkJC/2bjoi4i1+f0qJvZTImZ/FtkKqiae6s1WbtBxO/Lm5gNvCAu11GEe1pSmFd20n7OOHrWnjhIYsxGeQ9djOwrclRpL5EaSspjDGI3tXKQSMfcutnIDlR0Q99F3Dtu2Rqr+50cRd3980vyE0VwZENPMndCgCxSm893xOpzUACLJBmFN3/3LIEtxOifHXsp+6XeIpj1iMZHJirkyZW2QZ/ZdFiDqkJ9Bq8hdinx1QSQ1CLsRJz/FvXZJh6gGP/VGUIX4oss=" diff --git a/docker-compose-ci.yaml b/docker-compose-ci.yaml index 9e081e5a5..29f37202a 100644 --- a/docker-compose-ci.yaml +++ b/docker-compose-ci.yaml @@ -9,6 +9,7 @@ services: app: image: quay.io/ncigdc/jenkins-agent:multipython environment: + SWAGGER_URL: "https://nexus.osdc.io/repository/maven-public/io/swagger/swagger-codegen-cli/2.3.1/swagger-codegen-cli-2.3.1.jar" SSH_AUTH_SOCK: $SSH_AUTH_SOCK HTTPS_PROXY: http://cloud-proxy:3128 HTTP_PROXY: http://cloud-proxy:3128 diff --git a/tox.ini b/tox.ini index 68db45c39..6698ff5e3 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ whitelist_externals= /bin/bash deps= -rrequirements.txt -rtest-requirements.txt commands= - wget -nc https://oss.sonatype.org/content/repositories/releases/io/swagger/swagger-codegen-cli/2.3.1/swagger-codegen-cli-2.3.1.jar + wget -nc $SWAGGER_URL java -jar swagger-codegen-cli-2.3.1.jar generate -i openapis/swagger.yaml -l python -o swagger_client bash -ec "cd swagger_client/; python setup.py install; cd .." pytest {posargs: --cov=indexd -lvvx tests/ --cov-report=html --cov-report=xml --junit-xml=test-reports/results.xml}