From d679cf6e01abbe0eba084f6ee5f15f609659fffa Mon Sep 17 00:00:00 2001 From: Khai Do Date: Fri, 4 Nov 2016 13:33:12 -0700 Subject: [PATCH] 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 --- jenkins/jobs/api-jobs.yaml | 16 ++++++++-------- jenkins/jobs/devstack-gate.yaml | 2 +- jenkins/jobs/grenade.yaml | 4 ++-- jenkins/jobs/infra-publish-jobs.yaml | 4 ++-- jenkins/jobs/infra.yaml | 20 ++++++++++---------- jenkins/jobs/macros.yaml | 6 +++--- jenkins/jobs/manuals-jobs.yaml | 4 ++-- jenkins/jobs/python-jobs.yaml | 6 +++--- jenkins/jobs/specs-jobs.yaml | 2 +- jenkins/jobs/tripleo.yaml | 4 ++-- jenkins/jobs/windmill.yaml | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/jenkins/jobs/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml index 49bdef1593..6a1e5bdd5b 100644 --- a/jenkins/jobs/api-jobs.yaml +++ b/jenkins/jobs/api-jobs.yaml @@ -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: diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 8586c76a18..755a293ebd 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -2189,7 +2189,7 @@ - gerrit-git-prep - install-distro-packages - revoke-sudo - - tox: + - run-tox: envlist: run-tests publishers: diff --git a/jenkins/jobs/grenade.yaml b/jenkins/jobs/grenade.yaml index edc044ee02..f167833cc6 100644 --- a/jenkins/jobs/grenade.yaml +++ b/jenkins/jobs/grenade.yaml @@ -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: diff --git a/jenkins/jobs/infra-publish-jobs.yaml b/jenkins/jobs/infra-publish-jobs.yaml index b0b545de34..b7cd8bd2ea 100644 --- a/jenkins/jobs/infra-publish-jobs.yaml +++ b/jenkins/jobs/infra-publish-jobs.yaml @@ -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: diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml index 3e3ca65f19..d6d299ddb1 100644 --- a/jenkins/jobs/infra.yaml +++ b/jenkins/jobs/infra.yaml @@ -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: diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml index e1fb8b2afc..419ba6dbe4 100644 --- a/jenkins/jobs/macros.yaml +++ b/jenkins/jobs/macros.yaml @@ -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}" diff --git a/jenkins/jobs/manuals-jobs.yaml b/jenkins/jobs/manuals-jobs.yaml index 60efb450bf..3999493616 100644 --- a/jenkins/jobs/manuals-jobs.yaml +++ b/jenkins/jobs/manuals-jobs.yaml @@ -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: diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml index f9944806df..6b14acc36a 100644 --- a/jenkins/jobs/python-jobs.yaml +++ b/jenkins/jobs/python-jobs.yaml @@ -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 diff --git a/jenkins/jobs/specs-jobs.yaml b/jenkins/jobs/specs-jobs.yaml index 1d7900ab7d..90a6bee545 100644 --- a/jenkins/jobs/specs-jobs.yaml +++ b/jenkins/jobs/specs-jobs.yaml @@ -46,7 +46,7 @@ - gerrit-git-prep - install-distro-packages - revoke-sudo - - tox: + - run-tox: envlist: specs - job: diff --git a/jenkins/jobs/tripleo.yaml b/jenkins/jobs/tripleo.yaml index 714c998281..773e0ea302 100644 --- a/jenkins/jobs/tripleo.yaml +++ b/jenkins/jobs/tripleo.yaml @@ -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: diff --git a/jenkins/jobs/windmill.yaml b/jenkins/jobs/windmill.yaml index 7a4ea37db4..21fbc4965a 100644 --- a/jenkins/jobs/windmill.yaml +++ b/jenkins/jobs/windmill.yaml @@ -24,7 +24,7 @@ - print-template-name: template-name: "{template-name}" - windmill-checkout - - tox: + - run-tox: envlist: "{scenario}" publishers: