#195 replace partner-bugzilla with bugzilla.stage
Merged 2 years ago by kparal. Opened 2 years ago by kparal.

file modified
+2 -2
@@ -23,7 +23,7 @@ 

  Requires:       python3-fedora-flask

  Requires:       python3-alembic

  Requires:       python3-psycopg2

- Requires:       python3-bugzilla

+ Requires:       python3-bugzilla >= 3.1.0

  Requires:       python3-flask-admin

  Requires:       python3-iso8601

  Requires:       python3-openid
@@ -46,7 +46,7 @@ 

  BuildRequires:  python3-koji

  BuildRequires:  python3-sqlalchemy

  BuildRequires:  python3-sphinx

- BuildRequires:  python3-bugzilla

+ BuildRequires:  python3-bugzilla >= 3.1.0

  BuildRequires:  python3-iso8601

  

  %description

file modified
+1 -1
@@ -32,7 +32,7 @@ 

      SECRET_KEY = None  # REPLACE THIS WITH A RANDOM STRING

      SQLALCHEMY_DATABASE_URI = 'sqlite://'  # just 'sqlite://' without a path means an in-memory db

      SQLALCHEMY_TRACK_MODIFICATIONS = False

-     BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/'

+     BUGZILLA_URL = 'https://bugzilla.stage.redhat.com/'

      BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'

      KOJI_URL = 'http://koji.stg.fedoraproject.org/'

      BODHI_URL = 'https://bodhi.stg.fedoraproject.org/'

@@ -84,7 +84,7 @@ 

              <div class="col-md-12" id="info-container">

                  <div class="alert-warning alert z-fix" role="alert">

                      This is <b>NOT the production instance!</b> Any changes will

-                     show up in partner-bugzilla instead of production bugzilla

+                     show up in the staging bugzilla instead of the production bugzilla

                      and the staging instance of FAS is being used for authentication.

                  </div>

              </div>

@@ -6,11 +6,11 @@ 

  </div>

  {% endif %} {%- endmacro %} {% extends "base_nav.html" %} {% block jsheader %} {% endblock %} {% block info %}

  <div class="row">

-     <div class="col-md-12" id="partnerbz-container">

-         {# Figure out a way to show this if partner-bugzilla is being used

+     <div class="col-md-12" id="stagebz-container">

+         {# Figure out a way to show this if staging bugzilla is being used

          <div class="alert-info alert" role="alert">

              The proposal functionality is hooked up to

-             <a href="https://partner-bugzilla.redhat.com/">partner-bugzilla</a>

+             <a href="https://bugzilla.stage.redhat.com/">staging bugzilla</a>

              which isn't always in sync with the real bugzilla instance. Any bugs proposed though this page will only show up there and

              not in the production bugzilla. You may see errors about invalid bugs which would not be true about the production

              bugzilla instance.

@@ -74,7 +74,7 @@ 

                                              tokenfile=None)

          self.logger.info('Using bugzilla URL: %s' % url)

  

-     # https://partner-bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED

+     # https://bugzilla.stage.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED

      # &bug_status=POST&bug_status=MODIFIED&classification=Fedora&component=anaconda&f1=component

      # &o1=changedafter&product=Fedora&query_format=advanced&v1=2013-03-21%2012%3A25&version=19

      def get_bz_query(self, tracker: int, last_update: datetime.datetime = None) -> dict[str, Any]:

file modified
+2 -2
@@ -6,8 +6,8 @@ 

  FAS_ADMIN_GROUP = "magic-fas-group"

  FAS_USER = "magicuser@unicornsarereal.com"

  FAS_PASSWORD = "password"

- BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/'

- BUGZILLA_XMLRPC = 'https://partner-bugzilla.redhat.com/xmlrpc.cgi'

+ BUGZILLA_URL = 'https://bugzilla.stage.redhat.com/'

+ BUGZILLA_XMLRPC = 'https://bugzilla.stage.redhat.com/xmlrpc.cgi'

  KOJI_URL = 'http://koji.stg.fedoraproject.org/'

  BODHI_URL = 'https://admin.stg.fedoraproject.org/updates/'

  FILE_LOGGING = False

file modified
+3 -3
@@ -14,6 +14,6 @@ 

  python3 run_cli.py add_milestone -r 35 -m beta -b 1891953 -a 1891954

  python3 run_cli.py add_milestone -r 35 -m final -b 1891955 -a 1891956

  

- # partner-bugzilla alternative numbers:

- #python3 run_cli.py add_milestone -r 35 -m beta -b 1732917 -a 1732918

- #python3 run_cli.py add_milestone -r 35 -m final -b 1732919 -a 1732920

+ # staging bugzilla alternative numbers:

+ #python3 run_cli.py add_milestone -r 35 -m beta -b 1891953 -a 1891954

+ #python3 run_cli.py add_milestone -r 35 -m final -b 1891955 -a 1891956

file modified
+1 -1
@@ -19,7 +19,7 @@ 

  pycurl

  pytest-cov

  pytest

- python-bugzilla

+ python-bugzilla >= 3.1.0

  python-fedora

  python-openid-cla

  python-openid-teams

https://partner-bugzilla.redhat.com is being removed, and
https://bugzilla.stage.redhat.com is provided instead. Replace all configuration
and code with the new URL.

Require python-bugzilla >= 3.1.0, because it contains an important fix for
bugzilla.stage handling.

Build succeeded.

rebased onto 3aaa747

2 years ago

Build succeeded.

@frantisekz @lbrabec Any concerns before I push this?

rebased onto 4cb79a4

2 years ago

Build succeeded.

@frantisekz @lbrabec Any concerns before I push this?

The new python-bugzilla is available in F33 (which is the prod vm os), LGTM.

Commit 8597c21 fixes this pull-request

Pull-Request has been merged by kparal

2 years ago