Closed Bug 1417697 Opened 2 years ago Closed 2 years ago

Tagging doesn't support relbranches

Categories

(Release Engineering :: Release Automation: Other, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: nthomas, Assigned: aki)

Details

We created FIREFOX_58b4_RELBRANCH to build 58.0b4 on the same rev as 58.0b3, as there had been other code changes in the meantime. The version bump task failed to handle that.

The full logs at https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-beta-noarch/release-mozilla-beta-firefox_version_bump-bm94-build1-build8.txt.gz but here are some excerpts:

13:39:09     INFO - Running command: ['hg', '--config', 'ui.merge=internal:merge', '--config', 'extensions.robustcheckout=/builds/slave/rel-m-beta-fx_version_bump-000/scripts/external_tools/robustcheckout.py', 'robustcheckout', 'https://hg.mozilla.org/releases/mozilla-beta', 'mozilla-beta', '--sharebase', '/builds/hg-shared', '--upstream', 'https://hg.mozilla.org/mozilla-unified', '--branch', 'default']
...
13:42:02     INFO - 232510 files updated, 0 files merged, 0 files removed, 0 files unresolved
13:42:02     INFO -  updated to 7ecf3934e7583927c17f861851e6890771e6ca77

# which was the tip of beta at the time, and the version bump works ok:

13:42:02     INFO - Running command: ['hg', 'diff'] in /builds/slave/rel-m-beta-fx_version_bump-000/build/mozilla-beta
13:42:02     INFO - Copy/paste: hg diff
13:42:04     INFO -  diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
13:42:04     INFO -  --- a/browser/config/version_display.txt
13:42:04     INFO -  +++ b/browser/config/version_display.txt
13:42:04     INFO -  @@ -1,1 +1,1 @@
13:42:04     INFO -  -58.0b4
13:42:04     INFO -  +58.0b5

# but then tagging fails:

13:42:47     INFO - Running main action method: tag
13:42:47     INFO - No bug - Tagging 03402f586daaea0c5dbc80c281d262db9c9de430 with FIREFOX_58_0b4_BUILD1, FIREFOX_58_0b4_RELEASE a=release CLOSED TREE
13:42:47     INFO - Running command: ['hg', 'tag', '-m', 'No bug - Tagging 03402f586daaea0c5dbc80c281d262db9c9de430 with FIREFOX_58_0b4_BUILD1, FIREFOX_58_0b4_RELEASE a=release CLOSED TREE', '-u', 'ffxbld <release@mozilla.com>', '-r', u'03402f586daaea0c5dbc80c281d262db9c9de430', '-f', 'FIREFOX_58_0b4_BUILD1', 'FIREFOX_58_0b4_RELEASE'] in /builds/slave/rel-m-beta-fx_version_bump-000/build/mozilla-beta
13:42:47     INFO - Copy/paste: hg tag -m "No bug - Tagging 03402f586daaea0c5dbc80c281d262db9c9de430 with FIREFOX_58_0b4_BUILD1, FIREFOX_58_0b4_RELEASE a=release CLOSED TREE" -u "ffxbld <release@mozilla.com>" -r 03402f586daaea0c5dbc80c281d262db9c9de430 -f FIREFOX_58_0b4_BUILD1 FIREFOX_58_0b4_RELEASE
[Traceback elided here]
13:42:51     INFO -  RepoLookupError: unknown revision '03402f586daaea0c5dbc80c281d262db9c9de430'
13:42:51    ERROR -  abort: unknown revision '03402f586daaea0c5dbc80c281d262db9c9de430'!
13:42:51    ERROR -  Automation Error: hg not responding
13:42:51    ERROR - Return code: 255
13:42:51    ERROR - 255 not in success codes: [0]
The issue stems from mozilla-unified as the base pull, because that doesn't include any relbranches. If we were do a 
  hg pull https://hg.mozilla.org/releases/mozilla-beta
then it'd know about rev 03402f586daa.
Assignee: nobody → aki
Patch is in bug 1425215.
Tentatively calling this fixed.
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.