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:
@@ -6,7 +6,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'publishdocs-api'
|
envlist: 'publishdocs-api'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'publishlang-api'
|
envlist: 'publishlang-api'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'api-guide'
|
envlist: 'api-guide'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -76,7 +76,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'api-guide'
|
envlist: 'api-guide'
|
||||||
- add-docs-root-marker:
|
- add-docs-root-marker:
|
||||||
docsrootdir: api-guide/build/html
|
docsrootdir: api-guide/build/html
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'api-ref'
|
envlist: 'api-ref'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -152,7 +152,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'api-ref'
|
envlist: 'api-ref'
|
||||||
- add-docs-root-marker:
|
- add-docs-root-marker:
|
||||||
docsrootdir: api-ref/build/html
|
docsrootdir: api-ref/build/html
|
||||||
@@ -221,7 +221,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'murano-firstapp'
|
envlist: 'murano-firstapp'
|
||||||
- add-docs-root-marker:
|
- add-docs-root-marker:
|
||||||
docsrootdir: doc/build/murano-firstapp/html
|
docsrootdir: doc/build/murano-firstapp/html
|
||||||
@@ -250,7 +250,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'murano-firstapp'
|
envlist: 'murano-firstapp'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
@@ -2189,7 +2189,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: run-tests
|
envlist: run-tests
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'docs'
|
envlist: 'docs'
|
||||||
- add-docs-root-marker:
|
- add-docs-root-marker:
|
||||||
docsrootdir: doc/build/html
|
docsrootdir: doc/build/html
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'docs'
|
envlist: 'docs'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: infra-docs
|
envlist: infra-docs
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: infra-docs
|
envlist: infra-docs
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'gerrit'
|
envlist: 'gerrit'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'irc'
|
envlist: 'irc'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'grafyaml'
|
envlist: 'grafyaml'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'zuul'
|
envlist: 'zuul'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'jenkins-project'
|
envlist: 'jenkins-project'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -87,7 +87,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'nodepool'
|
envlist: 'nodepool'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -238,7 +238,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'ical'
|
envlist: 'ical'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -278,7 +278,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'ical'
|
envlist: 'ical'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -314,7 +314,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'ansible-syntax-check'
|
envlist: 'ansible-syntax-check'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -331,7 +331,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: 'dib'
|
envlist: 'dib'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
@@ -367,13 +367,13 @@
|
|||||||
- builder:
|
- builder:
|
||||||
name: linters
|
name: linters
|
||||||
builders:
|
builders:
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: linters
|
envlist: linters
|
||||||
|
|
||||||
- builder:
|
- builder:
|
||||||
name: bashate
|
name: bashate
|
||||||
builders:
|
builders:
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: bashate
|
envlist: bashate
|
||||||
|
|
||||||
- builder:
|
- builder:
|
||||||
@@ -772,7 +772,7 @@
|
|||||||
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh pypy"
|
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh pypy"
|
||||||
|
|
||||||
- builder:
|
- builder:
|
||||||
name: tox
|
name: run-tox
|
||||||
builders:
|
builders:
|
||||||
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist}"
|
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist}"
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: '{envlist}'
|
envlist: '{envlist}'
|
||||||
- assert-no-extra-files
|
- assert-no-extra-files
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: '{envlist}'
|
envlist: '{envlist}'
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
@@ -488,7 +488,7 @@
|
|||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: '{envlist}'
|
envlist: '{envlist}'
|
||||||
- assert-no-extra-files
|
- assert-no-extra-files
|
||||||
|
|
||||||
@@ -511,7 +511,7 @@
|
|||||||
template-name: "{template-name}"
|
template-name: "{template-name}"
|
||||||
- zuul-git-prep-upper-constraints
|
- zuul-git-prep-upper-constraints
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: '{envlist}'
|
envlist: '{envlist}'
|
||||||
- assert-no-extra-files
|
- assert-no-extra-files
|
||||||
|
|
||||||
@@ -541,7 +541,7 @@
|
|||||||
- pgsql-db:
|
- pgsql-db:
|
||||||
db_name: openstack_citest
|
db_name: openstack_citest
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: '{envlist}'
|
envlist: '{envlist}'
|
||||||
- assert-no-extra-files
|
- assert-no-extra-files
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- install-distro-packages
|
- install-distro-packages
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: specs
|
envlist: specs
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
|
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
|
||||||
ssh-keyscan localhost >> ~/.ssh/known_hosts
|
ssh-keyscan localhost >> ~/.ssh/known_hosts
|
||||||
ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
|
ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: "{scenario}"
|
envlist: "{scenario}"
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
@@ -76,7 +76,7 @@
|
|||||||
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
|
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
|
||||||
ssh-keyscan localhost >> ~/.ssh/known_hosts
|
ssh-keyscan localhost >> ~/.ssh/known_hosts
|
||||||
ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
|
ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: "{scenario}"
|
envlist: "{scenario}"
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
- print-template-name:
|
- print-template-name:
|
||||||
template-name: "{template-name}"
|
template-name: "{template-name}"
|
||||||
- windmill-checkout
|
- windmill-checkout
|
||||||
- tox:
|
- run-tox:
|
||||||
envlist: "{scenario}"
|
envlist: "{scenario}"
|
||||||
|
|
||||||
publishers:
|
publishers:
|
||||||
|
|||||||
Reference in New Issue
Block a user