diff --git a/elasticRecheck.conf.sample b/elasticRecheck.conf.sample index 2b038f85..35dcbbd8 100644 --- a/elasticRecheck.conf.sample +++ b/elasticRecheck.conf.sample @@ -14,7 +14,7 @@ ci_username=jenkins [gerrit] user=treinish -host=review.openstack.org +host=review.opendev.org query_file=/home/mtreinish/elasticRecheck/queries key=/home/mtreinish/.ssh/id_rsa diff --git a/elastic_recheck/cmd/graph.py b/elastic_recheck/cmd/graph.py index 76ecab3a..14a262b0 100755 --- a/elastic_recheck/cmd/graph.py +++ b/elastic_recheck/cmd/graph.py @@ -76,9 +76,9 @@ def get_launchpad_bug(bug): def get_open_reviews(bug_number, attempt=0): """return list of open gerrit reviews for a given bug.""" - r = requests.get("https://review.openstack.org:443/changes/" + r = requests.get("https://review.opendev.org:443/changes/" "?q=status:open++message:`%s`+NOT+" - "project:openstack-infra/elastic-recheck" % bug_number) + "project:opendev/elastic-recheck" % bug_number) # If we got a proxy error let's retry until we're out of attempts. if r.status_code == 502 and attempt < 3: LOG.debug('Retry changes query for bug %s. Attempt %s of 3.', @@ -87,7 +87,7 @@ def get_open_reviews(bug_number, attempt=0): # strip off first few chars because 'the JSON response body starts with a # magic prefix line that must be stripped before feeding the rest of the # response body to a JSON parser' - # https://review.openstack.org/Documentation/rest-api.html + # https://review.opendev.org/Documentation/rest-api.html reviews = [] result = None try: diff --git a/elastic_recheck/config.py b/elastic_recheck/config.py index dec4ef7f..7af3fba0 100644 --- a/elastic_recheck/config.py +++ b/elastic_recheck/config.py @@ -26,7 +26,7 @@ JOBS_RE = 'dsvm' CI_USERNAME = 'jenkins' GERRIT_QUERY_FILE = 'queries' -GERRIT_HOST = 'review.openstack.org' +GERRIT_HOST = 'review.opendev.org' PID_FN = '/var/run/elastic-recheck/elastic-recheck.pid' diff --git a/elastic_recheck/tests/unit/gerrit/events.json b/elastic_recheck/tests/unit/gerrit/events.json index 262b0a6b..966f1826 100644 --- a/elastic_recheck/tests/unit/gerrit/events.json +++ b/elastic_recheck/tests/unit/gerrit/events.json @@ -27,7 +27,7 @@ "eventCreatedOn": 1389371115, "change": { "topic": "bp\/mapping", - "url": "https:\/\/review.openstack.org\/60244", + "url": "https:\/\/review.opendev.org\/60244", "number": "60244", "project": "openstack\/keystone", "branch": "master", @@ -68,7 +68,7 @@ "eventCreatedOn": 1389384794, "change": { "topic": "65361", - "url": "https:\/\/review.openstack.org\/65361", + "url": "https:\/\/review.opendev.org\/65361", "number": "65361", "project": "openstack\/requirements", "branch": "master", @@ -109,7 +109,7 @@ "eventCreatedOn": 1389383805, "change": { "topic": "bp\/image-flavor-selection-ux-enhancement", - "url": "https:\/\/review.openstack.org\/63078", + "url": "https:\/\/review.opendev.org\/63078", "number": "63078", "project": "openstack\/horizon", "branch": "master", @@ -150,7 +150,7 @@ "eventCreatedOn": 1389306576, "change": { "topic": "slow-down-there-cowboy", - "url": "https:\/\/review.openstack.org\/65805", + "url": "https:\/\/review.opendev.org\/65805", "number": "65805", "project": "openstack-infra\/devstack-gate", "branch": "master", @@ -191,7 +191,7 @@ "eventCreatedOn": 1389391347, "change": { "topic": "1187119-a", - "url": "https:\/\/review.openstack.org\/65378", + "url": "https:\/\/review.opendev.org\/65378", "number": "65378", "project": "openstack\/api-site", "branch": "master", @@ -232,7 +232,7 @@ "eventCreatedOn": 1389378289, "change": { "topic": "bug\/1265108", - "url": "https:\/\/review.openstack.org\/64749", + "url": "https:\/\/review.opendev.org\/64749", "number": "64749", "project": "openstack\/keystone", "branch": "master", @@ -273,7 +273,7 @@ "eventCreatedOn": 1389378289, "change": { "topic": "bug\/1265108", - "url": "https:\/\/review.openstack.org\/64750", + "url": "https:\/\/review.opendev.org\/64750", "number": "64750", "project": "openstack\/keystone", "branch": "master", @@ -314,7 +314,7 @@ "eventCreatedOn": 1389387264, "change": { "topic": "bugs\/1267682", - "url": "https:\/\/review.openstack.org\/65902", + "url": "https:\/\/review.opendev.org\/65902", "number": "65902", "project": "openstack\/neutron", "branch": "master", @@ -355,7 +355,7 @@ "eventCreatedOn": 1389388172, "change": { "topic": "bug\/1253497", - "url": "https:\/\/review.openstack.org\/66064", + "url": "https:\/\/review.opendev.org\/66064", "number": "66064", "project": "openstack\/glance", "branch": "master", @@ -396,7 +396,7 @@ "eventCreatedOn": 1389354908, "change": { "topic": "del-param", - "url": "https:\/\/review.openstack.org\/65925", + "url": "https:\/\/review.opendev.org\/65925", "number": "65925", "project": "openstack\/savanna", "branch": "master", @@ -437,7 +437,7 @@ "eventCreatedOn": 1387806669, "change": { "topic": "bug\/1259078", - "url": "https:\/\/review.openstack.org\/61074", + "url": "https:\/\/review.opendev.org\/61074", "number": "61074", "project": "openstack\/heat", "branch": "master", diff --git a/elastic_recheck/tests/unit/test_bot.py b/elastic_recheck/tests/unit/test_bot.py index 4a410f8c..1e97383e 100644 --- a/elastic_recheck/tests/unit/test_bot.py +++ b/elastic_recheck/tests/unit/test_bot.py @@ -111,7 +111,7 @@ class TestBotWithTestTools(tests.TestCase): commenting=False) def fake_print(self, cls, channel, msg): - reference = ("openstack/keystone change: https://review.openstack.org/" + reference = ("openstack/keystone change: https://review.opendev.org/" "64750 failed because of: " "gate-keystone-python26: " "https://bugs.launchpad.net/bugs/123456, " diff --git a/elastic_recheck/tests/unit/test_stream.py b/elastic_recheck/tests/unit/test_stream.py index 934be1dd..ca30dcf3 100644 --- a/elastic_recheck/tests/unit/test_stream.py +++ b/elastic_recheck/tests/unit/test_stream.py @@ -44,7 +44,7 @@ class TestStream(tests.TestCase): self.assertEqual(event.rev, 6) self.assertEqual(event.project, "openstack/keystone") self.assertEqual(event.name(), "64750,6") - self.assertEqual(event.url, "https://review.openstack.org/64750") + self.assertEqual(event.url, "https://review.opendev.org/64750") self.assertEqual(sorted(event.build_short_uuids()), ["5dd41fe", "d3fd328"]) self.assertTrue(event.is_included_job()) @@ -62,7 +62,7 @@ class TestStream(tests.TestCase): self.assertEqual(event.rev, 6) self.assertEqual(event.project, "openstack/keystone") self.assertEqual(event.name(), "64749,6") - self.assertEqual(event.url, "https://review.openstack.org/64749") + self.assertEqual(event.url, "https://review.opendev.org/64749") self.assertEqual(sorted(event.build_short_uuids()), ["5dd41fe", "d3fd328"]) self.assertTrue(event.is_included_job()) @@ -80,7 +80,7 @@ class TestStream(tests.TestCase): self.assertEqual(event.rev, 19) self.assertEqual(event.project, "openstack/horizon") self.assertEqual(event.name(), "63078,19") - self.assertEqual(event.url, "https://review.openstack.org/63078") + self.assertEqual(event.url, "https://review.opendev.org/63078") self.assertEqual(event.build_short_uuids(), ["ab07162"]) event = stream.get_failed_tempest() @@ -88,7 +88,7 @@ class TestStream(tests.TestCase): self.assertEqual(event.rev, 2) self.assertEqual(event.project, "openstack/requirements") self.assertEqual(event.name(), "65361,2") - self.assertEqual(event.url, "https://review.openstack.org/65361") + self.assertEqual(event.url, "https://review.opendev.org/65361") self.assertEqual(event.build_short_uuids(), ["8209fb4"]) self.assertRaises( @@ -144,7 +144,7 @@ class TestStream(tests.TestCase): self.assertEqual(event.rev, 6) self.assertEqual(event.project, "openstack/keystone") self.assertEqual(event.name(), "64750,6") - self.assertEqual(event.url, "https://review.openstack.org/64750") + self.assertEqual(event.url, "https://review.opendev.org/64750") self.assertEqual(sorted(event.build_short_uuids()), ["5dd41fe", "d3fd328"]) self.assertTrue(event.is_included_job()) @@ -172,7 +172,7 @@ class TestStream(tests.TestCase): self.assertEqual(event.rev, 6) self.assertEqual(event.project, "openstack/keystone") self.assertEqual(event.name(), "64749,6") - self.assertEqual(event.url, "https://review.openstack.org/64749") + self.assertEqual(event.url, "https://review.opendev.org/64749") self.assertEqual(sorted(event.build_short_uuids()), ["5dd41fe", "d3fd328"]) self.assertTrue(event.is_included_job()) diff --git a/tools/unaccounted_rechecks.py b/tools/unaccounted_rechecks.py index 03e973b2..d2c74400 100755 --- a/tools/unaccounted_rechecks.py +++ b/tools/unaccounted_rechecks.py @@ -45,7 +45,7 @@ def get_options(): def connect_to_gerrit(user, key): - return gerrit.Gerrit('review.openstack.org', user, 29418, key) + return gerrit.Gerrit('review.opendev.org', user, 29418, key) def collect_rechecks(gerrit, days="14"):