Bug #14857

Some doc branches fail to build an ISO because the base branch of master is "testing" after a major release

Added by intrigeri 2017-10-17 16:27:49 . Updated 2018-02-09 15:33:31 .

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Build system
Target version:
Tails_3.6
Start date:
2017-10-17
Due date:
% Done:

100%

Feature Branch:
Type of work:
Contributors documentation
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

Until today our master branch had “testing” in config/base_branch. This worked for a while but about 10 days ago, branches based on master started failing to build ISO images. An instance of that problem was reported by sajolida.

I’ve just reset the base branch there to “stable” and I hope it’ll fix the problem for doc branches that have current master merged in (so they have my commit).

anonym, can you please:

  1. check that it fixes the problem (I’ve just merged this updated master branch into doc/9849-sponsor-deliverable-roles and pushed it)
  2. ensure we always reset the base branch to “stable” on the master branch at some well chosen point in the release process

I think this won’t happen after a bugfix release, so setting target version to our next major release (3.5).

Subtasks

Related issues

Related to Tails - Bug #14459: Some branches fail to build an ISO because we merge their base branch too late Resolved 2017-08-28
Blocks Tails - Feature #11355: Re-enable Jenkins notifications on ISO build/test failure In Progress 2017-08-28

History

#1 Updated by intrigeri 2017-10-17 16:28:20

  • related to Bug #14459: Some branches fail to build an ISO because we merge their base branch too late added

#2 Updated by intrigeri 2017-10-17 16:29:44

  • blocks Feature #11355: Re-enable Jenkins notifications on ISO build/test failure added

#3 Updated by anonym 2018-02-01 14:48:06

  • Status changed from Confirmed to Fix committed
  • Assignee changed from anonym to intrigeri
  • % Done changed from 0 to 50
  • QA Check set to Ready for QA

> ensure we always reset the base branch to “stable” on the master branch at some well chosen point in the release process

I just pushed (to master) commit:227399841bb183d0f1e19bfcff669902e1010e81 which I think is enough.

#4 Updated by anonym 2018-02-01 15:26:09

  • Status changed from Fix committed to In Progress

Applied in changeset commit:227399841bb183d0f1e19bfcff669902e1010e81.

#5 Updated by intrigeri 2018-02-02 14:32:49

  • Assignee changed from intrigeri to anonym
  • % Done changed from 50 to 70

LGTM, pushed commit:4bc45a54faaeca67698ffac0214874c869b56f0b on top to make it consistent with the rest of this section (I know it wasn’t previously, so your commit did not introduce any regression, but while we’re at it we can as well fix such issues :)

#6 Updated by anonym 2018-02-09 15:33:31

  • Status changed from In Progress to Resolved
  • Assignee deleted (anonym)
  • % Done changed from 70 to 100
  • QA Check changed from Ready for QA to Pass

intrigeri wrote:
> LGTM, pushed commit:4bc45a54faaeca67698ffac0214874c869b56f0b on top to make it consistent with the rest of this section (I know it wasn’t previously, so your commit did not introduce any regression, but while we’re at it we can as well fix such issues :)

Thanks, that looks better!