MozReview: Remove rbbz extension and artifacts (Bug 1262548). r?smacleod draft
authorDavid Walsh <dwalsh@mozilla.com>
Thu, 26 May 2016 16:48:12 -0500
changeset 8487 9960ec8d1250ba9b57fb2a39bb7ee98bcf192ea4
parent 8486 402dbbb4642b08f8f8de0278945e952027732c52
child 8510 f7c22c557fb63081949c0aa4d2aa72400b26623f
child 8562 29f3263e94f74c47c0c3588d2dcc9aa9440d4297
push id917
push userbmo:dwalsh@mozilla.com
push dateThu, 09 Jun 2016 17:49:07 +0000
reviewerssmacleod
bugs1262548
MozReview: Remove rbbz extension and artifacts (Bug 1262548). r?smacleod MozReview-Commit-ID: GI9hAwqeMIe
ansible/roles/docker-rbweb/files/install-reviewboard
ansible/roles/docker-rbweb/tasks/main.yml
ansible/tasks/install-mozreview.yml
create-test-environment
moz.build
pylib/rbbz/.gitignore
pylib/rbbz/MANIFEST.in
pylib/rbbz/rbbz/__init__.py
pylib/rbbz/rbbz/extension.py
pylib/rbbz/setup.py
testing/vcttesting/mozreview.py
--- a/ansible/roles/docker-rbweb/files/install-reviewboard
+++ b/ansible/roles/docker-rbweb/files/install-reviewboard
@@ -54,23 +54,20 @@ initialize()
 # have undesirable consequences.
 #
 # TODO this appears to add ~1s overhead. Consider putting this behavior
 # behind a flag.
 print('disabling extensions')
 site.run_manage_command('disable-extension',
                         ['mozreview.extension.MozReviewExtension'])
 site.run_manage_command('disable-extension',
-                        ['rbbz.extension.BugzillaExtension'])
-site.run_manage_command('disable-extension',
                         ['rbmotd.extension.MotdExtension'])
 
 print('enabling extensions')
 site.run_manage_command('enable-extension', ['mozreview.extension.MozReviewExtension'])
-site.run_manage_command('enable-extension', ['rbbz.extension.BugzillaExtension'])
 site.run_manage_command('enable-extension', ['rbmotd.extension.MotdExtension'])
 
 
 # Hook up Bugzilla authentication.
 site.run_manage_command('set-siteconfig', ['--key=auth_backend',
                         '--value=bugzilla'])
 
 site.run_manage_command('set-siteconfig', ['--key=logging_enabled',
--- a/ansible/roles/docker-rbweb/tasks/main.yml
+++ b/ansible/roles/docker-rbweb/tasks/main.yml
@@ -28,26 +28,24 @@
 - name: Install mozreview extension
   shell: /venv/bin/easy_install -U dist/*.egg chdir=/version-control-tools/pylib/mozreview
   tags:
     - docker-refresh
 
 - name: Build other extension
   command: /venv/bin/python setup.py bdist_egg chdir=/version-control-tools/pylib/{{ item }}
   with_items:
-    - rbbz
     - rbmotd
     - pygments_override
   tags:
     - docker-refresh
 
 - name: Install other extensions
   shell: /venv/bin/easy_install -U dist/*.egg chdir=/version-control-tools/pylib/{{ item }}
   with_items:
-    - rbbz
     - rbmotd
     - pygments_override
   tags:
     - docker-refresh
 
 - name: Remove default httpd configs
   file: path={{ item }} state=absent
   with_items:
--- a/ansible/tasks/install-mozreview.yml
+++ b/ansible/tasks/install-mozreview.yml
@@ -13,31 +13,22 @@
   command: "{{ venv }}/bin/hg --config extensions.purge= -R {{ rb_vct }} purge --all"
 
 # mozreview imports from mozautomation package. So, we need to install
 # mozautomation before mozreview can be built.
 
 - name: install mozautomation egg
   command: "{{ venv }}/bin/pip install --upgrade --no-deps --force-reinstall {{ rb_vct }}/pylib/mozautomation"
 
-# rbbz imports from mozreview package. So, we need to install mozreview before
-# rbbz can be built.
-
 - name: build mozreview egg
   command: "{{ python }} setup.py bdist_egg chdir={{ rb_vct }}/pylib/mozreview"
 
 - name: install mozreview egg
   shell: "{{ easy_install }} -U dist/*.egg chdir={{ rb_vct }}/pylib/mozreview"
 
-- name: build rbbz egg
-  command: "{{ python }} setup.py bdist_egg chdir={{ rb_vct }}/pylib/rbbz"
-
-- name: install rbbz egg
-  shell: "{{ easy_install }} -U dist/*.egg chdir={{ rb_vct }}/pylib/rbbz"
-
 - name: build rbmotd egg
   command: "{{ python }} setup.py bdist_egg chdir={{ rb_vct }}/pylib/rbmotd"
 
 - name: install rbmotd egg
   shell: "{{ easy_install }} -U dist/*.egg chdir={{ rb_vct }}/pylib/rbmotd"
 
 - name: build pygments_override egg
   command: "{{ python }} setup.py bdist_egg chdir={{ rb_vct }}/pylib/pygments_override"
--- a/create-test-environment
+++ b/create-test-environment
@@ -71,20 +71,16 @@ cd ../..
 cd pylib/mozreview
 python setup.py develop
 cd ../..
 
 cd pylib/mozreviewbots
 python setup.py develop
 cd ../..
 
-cd pylib/rbbz
-python setup.py develop
-cd ../..
-
 cd pylib/vcsreplicator
 python setup.py develop
 cd ../..
 
 cd hghooks
 python setup.py develop
 cd ..
 
--- a/moz.build
+++ b/moz.build
@@ -62,15 +62,11 @@ with Files('hgtemplates/**'):
 with Files('hgserver/**'):
     BUG_COMPONENT = ('Developer Services', 'Mercurial: hg.mozilla.org')
     FINAL = True
 
 with Files('hgwsgi/**'):
     BUG_COMPONENT = ('Developer Services', 'Mercurial: hg.mozilla.org')
     FINAL = True
 
-with Files('pylib/rbbz/**'):
-    BUG_COMPONENT = ('Developer Services', 'MozReview')
-    FINAL = True
-
 with Files('pylib/reviewboardmods/**'):
     BUG_COMPONENT = ('Developer Services', 'MozReview')
     FINAL = True
deleted file mode 100644
--- a/pylib/rbbz/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.pyc
-*~
-build
-dist
-rbbz.egg-info
deleted file mode 100644
--- a/pylib/rbbz/MANIFEST.in
+++ /dev/null
@@ -1,1 +0,0 @@
-include README.md
deleted file mode 100644
deleted file mode 100644
--- a/pylib/rbbz/rbbz/extension.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from reviewboard.extensions.base import Extension
-
-
-class BugzillaExtension(Extension):
-
-    def initialize(self):
-        pass
deleted file mode 100644
--- a/pylib/rbbz/setup.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from reviewboard.extensions.packaging import setup
-
-PACKAGE = 'rbbz'
-VERSION = '0.2.9'
-
-setup(
-    name=PACKAGE,
-    version=VERSION,
-    description='Review Board extension for Bugzilla support',
-    url='https://github.com/mozilla/rbbz',
-    author='Mark Cote',
-    author_email='mcote@mozilla.com',
-    license='MPL 2.0',
-    packages=['rbbz'],
-    install_requires=['mozautomation>=0.2'],
-    entry_points={
-        'reviewboard.extensions':
-        '%s = rbbz.extension:BugzillaExtension' % PACKAGE,
-    }
-)
--- a/testing/vcttesting/mozreview.py
+++ b/testing/vcttesting/mozreview.py
@@ -394,17 +394,16 @@ class MozReview(object):
         name = 'mozreview-%s' % os.path.basename(self._path)
 
         data = json.dumps(['trigger', ROOT, {
             'name': name,
             'chdir': ROOT,
             'expression': ['anyof',
                 ['dirname', 'hgext/reviewboard'],
                 ['dirname', 'pylib/mozreview'],
-                ['dirname', 'pylib/rbbz'],
                 ['dirname', 'reviewboardmods'],
             ],
             'command': ['%s/mozreview' % ROOT, 'refresh', self._path],
         }])
         p = subprocess.Popen([WATCHMAN, '-j'], stdin=subprocess.PIPE)
         p.communicate(data)
         res = p.wait()
         if res != 0: