Update to tox_envlist variable

Rename tox_environment to tox_envlist to better map with tox --help
documentation. This also allows the following patch to support shell
environmental variables.

Change-Id: I2fb4e1c167ef93ad2948f2d328beff5e39ac52b7
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-07-14 09:23:20 -04:00
parent db1699a6fc
commit 9258e5b6d8
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
8 changed files with 16 additions and 16 deletions

View File

@ -5,10 +5,10 @@
chdir: "src/{{ zuul.project.canonical_name }}" chdir: "src/{{ zuul.project.canonical_name }}"
register: envlist register: envlist
- set_fact: - set_fact:
tox_environment: 'pep8' tox_envlist: 'pep8'
when: envlist.stdout.find('pep8') != -1 when: envlist.stdout.find('pep8') != -1
- set_fact: - set_fact:
tox_environment: 'linters' tox_envlist: 'linters'
when: envlist.stdout.find('linters') != -1 when: envlist.stdout.find('linters') != -1
roles: roles:
- tox - tox

View File

@ -1,3 +1,3 @@
--- ---
tox_environment: venv tox_envlist: venv
zuul_work_dir: "src/{{ zuul.project.canonical_name }}" zuul_work_dir: "src/{{ zuul.project.canonical_name }}"

View File

@ -18,7 +18,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
venv={{ tox_environment }} venv={{ tox_envlist }}
export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt

View File

@ -1,3 +1,3 @@
--- ---
tox_environment: venv tox_envlist: venv
zuul_work_dir: "src/{{ zuul.project.canonical_name }}" zuul_work_dir: "src/{{ zuul.project.canonical_name }}"

View File

@ -18,7 +18,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
venv={{ tox_environment }} venv={{ tox_envlist }}
export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt

View File

@ -1,3 +1,3 @@
--- ---
tox_environment: venv tox_envlist: venv
zuul_work_dir: "src/{{ zuul.project.canonical_name }}" zuul_work_dir: "src/{{ zuul.project.canonical_name }}"

View File

@ -9,7 +9,7 @@
# resulting environment at the end so that we have a record of exactly # resulting environment at the end so that we have a record of exactly
# what packages we ended up testing. # what packages we ended up testing.
venv={{ tox_environment }} venv={{ tox_envlist }}
if [[ -z "$venv" ]]; then if [[ -z "$venv" ]]; then
echo "Usage: $?" echo "Usage: $?"

View File

@ -22,8 +22,8 @@
Responds to two variables: Responds to two variables:
tox_environment tox_envlist
the environment to pass on the command line work against specified environments (ALL selects all)
tox_command_line tox_command_line
an optional command line an optional command line
@ -39,7 +39,7 @@
Uses tox with the "py27" environment. Uses tox with the "py27" environment.
vars: vars:
tox_environment: py27 tox_envlist: py27
- job: - job:
name: tox-py34 name: tox-py34
@ -49,7 +49,7 @@
Uses tox with the "py34" environment. Uses tox with the "py34" environment.
vars: vars:
tox_environment: py34 tox_envlist: py34
- job: - job:
name: tox-py35 name: tox-py35
@ -59,7 +59,7 @@
Uses tox with the "py35" environment. Uses tox with the "py35" environment.
vars: vars:
tox_environment: py35 tox_envlist: py35
- job: - job:
name: tox-docs name: tox-docs
@ -72,7 +72,7 @@
Uses tox with the "docs" environment. Uses tox with the "docs" environment.
vars: vars:
tox_environment: docs tox_envlist: docs
post-run: playbooks/tox/docs-post post-run: playbooks/tox/docs-post
- job: - job:
@ -93,7 +93,7 @@
Uses tox with the "cover" environment. Uses tox with the "cover" environment.
vars: vars:
tox_environment: cover tox_envlist: cover
- job: - job:
name: tox-tarball name: tox-tarball
@ -104,7 +104,7 @@
Uses tox with the "venv" environment. Uses tox with the "venv" environment.
vars: vars:
tox_environment: venv tox_envlist: venv
run: playbooks/tox/tarball run: playbooks/tox/tarball
post-run: playbooks/tox/tarball-post post-run: playbooks/tox/tarball-post