Feature #12536

Have the devel branch based on Stretch

Added by intrigeri 2017-05-11 16:12:23 . Updated 2017-06-01 16:47:22 .

Status:
Resolved
Priority:
Elevated
Assignee:
Category:
Target version:
Tails_3.0
Start date:
2017-05-11
Due date:
% Done:

100%

Feature Branch:
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

i.e. merged feature/stretch into devel and adjust some special casing we have about feature/stretch in the build system.

Subtasks

Related issues

Blocked by Tails - Feature #12284: Deal with January 2017 false positive scenarios Rejected 2017-03-04 2017-03-10
Blocked by Tails - Feature #12286: Deal with February 2017 false positive scenarios Rejected 2017-03-04 2017-03-10
Blocks Tails - Feature #12604: Remove the feature/stretch Jenkins jobs Resolved 2017-05-26

History

#1 Updated by intrigeri 2017-05-16 13:29:30

  • blocked by Feature #12284: Deal with January 2017 false positive scenarios added

#2 Updated by intrigeri 2017-05-16 13:29:34

  • blocks Feature #12285: Deal with March 2017 false positive scenarios added

#3 Updated by intrigeri 2017-05-16 13:29:38

  • blocks Feature #12286: Deal with February 2017 false positive scenarios added

#4 Updated by intrigeri 2017-05-16 13:29:45

  • blocked by deleted (Feature #12285: Deal with March 2017 false positive scenarios)

#5 Updated by intrigeri 2017-05-16 13:29:47

  • blocked by deleted (Feature #12286: Deal with February 2017 false positive scenarios)

#6 Updated by intrigeri 2017-05-16 13:29:53

  • blocked by Feature #12285: Deal with March 2017 false positive scenarios added

#7 Updated by intrigeri 2017-05-16 13:29:59

  • blocked by Feature #12286: Deal with February 2017 false positive scenarios added

#8 Updated by intrigeri 2017-05-16 13:30:09

  • blocked by Feature #12287: Deal with April 2017 false positive scenarios added

#9 Updated by intrigeri 2017-05-16 13:30:26

(If I did this now, we’ll lose Jenkins tests history.)

#10 Updated by intrigeri 2017-05-18 17:37:52

  • blocks deleted (Feature #12285: Deal with March 2017 false positive scenarios)

#11 Updated by intrigeri 2017-05-18 17:37:55

  • blocks deleted (Feature #12287: Deal with April 2017 false positive scenarios)

#12 Updated by intrigeri 2017-05-19 10:35:50

  • Target version changed from Tails_3.0~rc1 to Tails_3.0

#13 Updated by intrigeri 2017-05-26 05:59:34

  • Status changed from Confirmed to In Progress

Applied in changeset commit:cb9f0fa50f679612ebc2a3badff185d556029ed3.

#14 Updated by intrigeri 2017-05-26 06:01:26

  • % Done changed from 0 to 10

Done! Next steps:

  1. try building the updated devel branch locally
  2. merge testing or devel into every active branch whose base branch is set to feature/stretch
  3. re-enable Jenkins

#15 Updated by intrigeri 2017-05-26 06:44:02

  • blocks Feature #12604: Remove the feature/stretch Jenkins jobs added

#16 Updated by intrigeri 2017-05-26 06:46:35

  • % Done changed from 10 to 50

intrigeri wrote:
> Done! Next steps:
>
> # try building the updated devel branch locally
> # merge testing or devel into every active branch whose base branch is set to feature/stretch
> # re-enable Jenkins

Done, let’s see how it goes on Jenkins.

#17 Updated by intrigeri 2017-05-26 08:49:09

  • Assignee changed from intrigeri to anonym
  • % Done changed from 50 to 60
  • QA Check set to Ready for QA

Both testing and devel have built successfully on Jenkins.

#18 Updated by anonym 2017-06-01 16:45:49

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

Indeed, builds for testing and devel look fine now. Tests looks good for testing, but devel is quite broken but that is explained by Bug #12617 so it’s unrelated to this move. Looks good to me!

#19 Updated by anonym 2017-06-01 16:47:22

  • Status changed from Fix committed to Resolved