소스 검색

Use tests repo for common role test requirements

Using tox for requirements management requires in-repo
requirements files for all our repositories. Rather than
do that, we make use of the tests repo to capture our
common requirements and use this to install them.

This reduces our review requirement rate and simplifies
maintenance for us for the tox config. It also makes it
usable with 'Depends-On', which is marvellous!

The tox requirements definitions for docs/releasenotes
builds are left in-place as those are standard entries
across the community. If that changes at some point, we
can re-assess those entries too.

Depends-On: https://review.openstack.org/579208
Change-Id: I83efde2ee1aa243ba71b7774a2de780ec5f4c3e6
changes/21/579621/1
Heba Naser 1 년 전
부모
커밋
954d544301
2개의 변경된 파일1개의 추가작업 그리고 26개의 파일을 삭제
  1. 0
    9
      test-requirements.txt
  2. 1
    17
      tox.ini

+ 0
- 9
test-requirements.txt 파일 보기

@@ -1,9 +0,0 @@
1
-# The order of packages is significant, because pip processes them in the order
2
-# of appearance. Changing the order has an impact on the overall integration
3
-# process, which may cause wedges in the gate later.
4
-bashate>=0.5.1 # Apache-2.0
5
-flake8<2.6.0,>=2.5.4 # MIT
6
-pyasn1!=0.2.3,>=0.1.8 # BSD
7
-pyOpenSSL>=17.1.0 # Apache-2.0
8
-requests>=2.14.2 # Apache-2.0
9
-ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD

+ 1
- 17
tox.ini 파일 보기

@@ -8,8 +8,6 @@ envlist = docs,linters,functional
8 8
 usedevelop = True
9 9
 install_command =
10 10
     pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
11
-deps =
12
-    -r{toxinidir}/test-requirements.txt
13 11
 commands =
14 12
     /usr/bin/find . -type f -name "*.pyc" -delete
15 13
 passenv =
@@ -73,38 +71,24 @@ commands =
73 71
     bash -c "{toxinidir}/tests/common/test-bashate.sh"
74 72
 
75 73
 
76
-[testenv:ansible]
77
-deps =
78
-    {[testenv]deps}
79
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt
80
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
81
-
82
-
83 74
 [testenv:ansible-syntax]
84
-deps =
85
-    {[testenv:ansible]deps}
86 75
 commands =
87 76
     bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
88 77
 
89 78
 
90 79
 [testenv:ansible-lint]
91
-deps =
92
-    {[testenv:ansible]deps}
93 80
 commands =
94 81
     bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
95 82
 
96 83
 
97 84
 [testenv:functional]
98
-deps =
99
-    {[testenv:ansible]deps}
100 85
 commands =
101 86
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
102 87
 
103 88
 
104 89
 [testenv:linters]
105
-deps =
106
-    {[testenv:ansible]deps}
107 90
 commands =
91
+    bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
108 92
     {[testenv:pep8]commands}
109 93
     {[testenv:bashate]commands}
110 94
     {[testenv:ansible-lint]commands}

Loading…
취소
저장