openstack
/
project-config
Code Issues Proposed changes

rename 'tox' macro to 'run-tox' 

JJB already has a tox module[1].  Defining a macro with the same name is
confusing and may cause problems when attempting to use this macro
elsewhere. Renaming it to something else should clear things up.

This is the warning from JJB:

$ jenkins-jobs test -o out ../project-config/jenkins/jobs
WARNING:jenkins_jobs.registry:You have a macro ('tox') defined for
'builder' component type that is masking an inbuilt definition

[1] http://docs.openstack.org/infra/jenkins-job-builder/builders.html#builders.tox

Change-Id: I6946229f6e94a5f4c10d6a5fc3b7049adeacacb1
This commit is contained in:
Khai Do 2016-11-04 13:33:12 -07:00 committed by Andreas Jaeger
parent c8937032b0
commit d679cf6e01
11 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jenkins/jobs/api-jobs.yaml
View File

@ -6,7 +6,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'publishdocs-api'
publishers:
@ -32,7 +32,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'publishlang-api'
publishers:
@ -59,7 +59,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'api-guide'
publishers:
@ -76,7 +76,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'api-guide'
- add-docs-root-marker:
docsrootdir: api-guide/build/html
@ -118,7 +118,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'api-ref'
publishers:
@ -152,7 +152,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'api-ref'
- add-docs-root-marker:
docsrootdir: api-ref/build/html
@ -221,7 +221,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'murano-firstapp'
- add-docs-root-marker:
docsrootdir: doc/build/murano-firstapp/html
@ -250,7 +250,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'murano-firstapp'
publishers:

2
jenkins/jobs/devstack-gate.yaml
View File

@ -2189,7 +2189,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: run-tests
publishers:

4
jenkins/jobs/grenade.yaml
View File

@ -8,7 +8,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'docs'
- add-docs-root-marker:
docsrootdir: doc/build/html
@ -35,7 +35,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'docs'
publishers:

4
jenkins/jobs/infra-publish-jobs.yaml
View File

@ -61,7 +61,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: infra-docs
publishers:
@ -86,7 +86,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: infra-docs
publishers:

20
jenkins/jobs/infra.yaml
View File

@ -7,7 +7,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'gerrit'
publishers:
@ -23,7 +23,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'irc'
publishers:
@ -39,7 +39,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'grafyaml'
publishers:
@ -55,7 +55,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'zuul'
publishers:
@ -71,7 +71,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'jenkins-project'
publishers:
@ -87,7 +87,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'nodepool'
publishers:
@ -238,7 +238,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'ical'
publishers:
@ -278,7 +278,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'ical'
publishers:
@ -314,7 +314,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'ansible-syntax-check'
publishers:
@ -331,7 +331,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: 'dib'
publishers:

6
jenkins/jobs/macros.yaml
View File

@ -367,13 +367,13 @@
- builder:
name: linters
builders:
- tox:
- run-tox:
envlist: linters
- builder:
name: bashate
builders:
- tox:
- run-tox:
envlist: bashate
- builder:
@ -772,7 +772,7 @@
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh pypy"
- builder:
name: tox
name: run-tox
builders:
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist}"

4
jenkins/jobs/manuals-jobs.yaml
View File

@ -28,7 +28,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: '{envlist}'
- assert-no-extra-files
@ -52,7 +52,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: '{envlist}'
publishers:

6
jenkins/jobs/python-jobs.yaml
View File

@ -488,7 +488,7 @@
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: '{envlist}'
- assert-no-extra-files
@ -511,7 +511,7 @@
template-name: "{template-name}"
- zuul-git-prep-upper-constraints
- install-distro-packages
- tox:
- run-tox:
envlist: '{envlist}'
- assert-no-extra-files
@ -541,7 +541,7 @@
- pgsql-db:
db_name: openstack_citest
- revoke-sudo
- tox:
- run-tox:
envlist: '{envlist}'
- assert-no-extra-files

2
jenkins/jobs/specs-jobs.yaml
View File

@ -46,7 +46,7 @@
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
- run-tox:
envlist: specs
- job:

4
jenkins/jobs/tripleo.yaml
View File

@ -55,7 +55,7 @@
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
ssh-keyscan localhost >> ~/.ssh/known_hosts
ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
- tox:
- run-tox:
envlist: "{scenario}"
publishers:
@ -76,7 +76,7 @@
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
ssh-keyscan localhost >> ~/.ssh/known_hosts
ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
- tox:
- run-tox:
envlist: "{scenario}"
publishers:

2
jenkins/jobs/windmill.yaml
View File

@ -24,7 +24,7 @@
- print-template-name:
template-name: "{template-name}"
- windmill-checkout
- tox:
- run-tox:
envlist: "{scenario}"
publishers: