From ad62f2b0f0314c507bfdf6b9dca0dbbd2086e8fa Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 22 May 2014 21:38:50 +0400 Subject: [PATCH] Rename oslo.test to oslotest Change-Id: Ibba6f0d8a30aad8f8f634df958f188c43f3378c8 --- .../files/gerritbot_channel_config.yaml | 2 +- .../{oslo.test.config => oslotest.config} | 0 .../jenkins_job_builder/config/oslo.yaml | 2 +- .../jenkins_job_builder/config/projects.yaml | 25 ++++----- .../files/review.projects.yaml | 8 +-- .../openstack_project/files/zuul/layout.yaml | 52 +++++++++---------- 6 files changed, 45 insertions(+), 44 deletions(-) rename modules/openstack_project/files/gerrit/acls/openstack/{oslo.test.config => oslotest.config} (100%) diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 07b6cedbb2..e080a7da8a 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -725,7 +725,7 @@ openstack-oslo: - openstack/oslo.rootwrap - openstack/oslosphinx - openstack/oslo-specs - - openstack/oslo.test + - openstack/oslotest - openstack/oslo.version - openstack/oslo.vmware - openstack/pycadf diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.test.config b/modules/openstack_project/files/gerrit/acls/openstack/oslotest.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.test.config rename to modules/openstack_project/files/gerrit/acls/openstack/oslotest.config diff --git a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml index 47197e3127..3bc55098c1 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml @@ -50,7 +50,7 @@ name: oslotest-cross-test injectedlib: oslotest - injectedrepo: openstack/oslo.test + injectedrepo: openstack/oslotest jobs: - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}': diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index a1f11eed57..e6566c87a6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -798,6 +798,19 @@ - pypi-jobs +- project: + name: oslotest + github-org: openstack + node: bare-precise + tarball-site: tarballs.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - python-jobs + - openstack-publish-jobs + - pypi-jobs + + - project: name: oslo.config github-org: openstack @@ -859,18 +872,6 @@ - python-jobs - pypi-jobs -- project: - name: oslo.test - github-org: openstack - node: bare-precise - tarball-site: tarballs.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs - - pypi-jobs - - project: name: oslo.version github-org: openstack diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 229118ce7c..c4a8591761 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -333,10 +333,6 @@ - project: openstack/oslo.rootwrap docimpact-group: openstack-manuals upstream: git://github.com/ttx/oslo.rootwrap.git -- project: openstack/oslo.test - description: OpenStack test classes - group: oslo - upstream: git://github.com/dhellmann/oslo.test.git - project: openstack/oslo.version docimpact-group: openstack-manuals upstream: git://github.com/emonty/oslo.version.git @@ -347,6 +343,10 @@ - project: openstack/oslosphinx docimpact-group: openstack-manuals description: Theme and utilities for Sphinx documentation tool +- project: openstack/oslotest + description: OpenStack test classes + group: oslo + upstream: git://github.com/dhellmann/oslo.test.git - project: openstack/pycadf description: CADF Python module - project: openstack/python-ceilometerclient diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 7c7abd8614..961f5b671c 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1894,6 +1894,32 @@ projects: - post-mirror-python27 - post-mirror-python33 + - name: openstack/oslotest + template: + - name: python-jobs + - name: python3-jobs + - name: pypy-jobs + - name: openstack-server-publish-jobs + - name: check-requirements + check: + - check-oslotest-dsvm-diskimage-builder + - check-oslotest-dsvm-oslo.config + - check-oslotest-dsvm-oslo.messaging + - check-oslotest-dsvm-tripleo-image-elements + gate: + - gate-oslotest-dsvm-diskimage-builder + - gate-oslotest-dsvm-oslo.config + - gate-oslotest-dsvm-oslo.messaging + - gate-oslotest-dsvm-tripleo-image-elements + pre-release: + - oslotest-tarball + release: + - oslotest-tarball: + - oslotest-pypi-upload: + - post-mirror-python26 + - post-mirror-python27 + - post-mirror-python33 + - name: openstack/oslo-incubator template: - name: python-jobs @@ -2064,32 +2090,6 @@ projects: - post-mirror-python27 - post-mirror-python33 - - name: openstack/oslo.test - template: - - name: python-jobs - - name: python3-jobs - - name: pypy-jobs - - name: openstack-server-publish-jobs - - name: check-requirements - check: - - check-oslotest-dsvm-diskimage-builder - - check-oslotest-dsvm-oslo.config - - check-oslotest-dsvm-oslo.messaging - - check-oslotest-dsvm-tripleo-image-elements - gate: - - gate-oslotest-dsvm-diskimage-builder - - gate-oslotest-dsvm-oslo.config - - gate-oslotest-dsvm-oslo.messaging - - gate-oslotest-dsvm-tripleo-image-elements - pre-release: - - oslo.test-tarball - release: - - oslo.test-tarball: - - oslo.test-pypi-upload: - - post-mirror-python26 - - post-mirror-python27 - - post-mirror-python33 - - name: openstack/oslo.version template: - name: python-jobs