Feature #8654

Have topic branches built using the packages from their base branch's APT repo

Added by intrigeri 2015-01-09 17:33:39 . Updated 2015-08-26 05:34:31 .

Status:
Resolved
Priority:
Elevated
Assignee:
Category:
Build system
Target version:
Tails_1.4
Start date:
2015-01-09
Due date:
2015-07-15
% Done:

100%

Feature Branch:
feature/8654-encode-apt-suite-in-git-with-APT-overlays-dot-d
Type of work:
Code
Blueprint:

https://tails.boum.org/blueprint/encode_APT_suite_in_Git/

Starter:
Affected tool:
Deliverable for:
266

Description

Base branch = the one the topic branch is meant to be merged into, e.g. stable or devel.

Currently, all topic branches use the devel APT suite.

The topic branch’s APT suite must be locally merged into their base branch’s one.

Rough ideas: adjust auto/scripts/tails-custom-apt-sources and release process to better detect base branch, extract base branch detection code from tails-custom-apt-sources to be able to use it in vagrant/provision/assets/build-tails, have build-tails locally merge the base branch into the topic one.

Another idea, that could simplify solving this problem, would be to have each branch contain a config file with the list of APT suites that shall be used. This way:

  • a topic branch would have stable or devel + the topic APT suite if needed;
  • a base branch would have its own suite (e.g. stable or devel) and, before release time, the list of branches that were merged into it;
  • at release time, the release manager would merge the topic APT suites into the base branch’s APT suite, and remove all topic APT suites from the aforementioned config file.

Subtasks

Related issues

Blocks Tails - Feature #8658: Deploy the "build all active branches" system Resolved 2015-01-09
Blocks Tails - Feature #8164: Finish automating the APT test suite Resolved 2014-10-20

History

#1 Updated by intrigeri 2015-01-09 17:48:45

  • blocks Feature #8658: Deploy the "build all active branches" system added

#2 Updated by bertagaz 2015-01-10 06:23:25

  • Target version changed from Tails_1.4 to Tails_1.3.2

#3 Updated by anonym 2015-01-10 18:17:42

  • blocks Feature #8164: Finish automating the APT test suite added

#4 Updated by intrigeri 2015-02-26 10:49:52

  • Assignee changed from Dr_Whax to intrigeri

Given the kind of big picture one needs to have in mind to work on this, I think it’s better if I take care of it. DrWhax doesn’t mind ;)

#5 Updated by intrigeri 2015-02-28 08:26:24

  • Priority changed from Normal to Elevated

#6 Updated by intrigeri 2015-03-25 10:08:36

Note to myself: read last anonym’s email in the “[Tails-dev] Automated builds specification” thread before going on working on this.

#7 Updated by intrigeri 2015-03-29 15:43:05

  • Target version changed from Tails_1.3.2 to Tails_1.4

#8 Updated by intrigeri 2015-03-31 19:28:30

  • Status changed from Confirmed to In Progress
  • Feature Branch set to feature/8654-encode-apt-suite-in-git

#9 Updated by intrigeri 2015-03-31 20:59:25

  • Blueprint set to https://tails.boum.org/blueprint/encode_APT_suite_in_Git/

#10 Updated by intrigeri 2015-04-01 19:37:04

Applied in changeset commit:592b82fd48bf4555f14fe22d16b08ea18975ab9d.

#11 Updated by intrigeri 2015-04-01 20:21:38

  • % Done changed from 0 to 10

#13 Updated by intrigeri 2015-04-07 16:51:46

  • % Done changed from 10 to 20

The homonym branch in the tails Puppet module’s repo has the corresponding changes to tails-diff-suites.

#14 Updated by intrigeri 2015-04-07 18:36:57

  • Assignee changed from intrigeri to anonym
  • % Done changed from 20 to 30
  • QA Check set to Ready for QA

#15 Updated by intrigeri 2015-04-08 12:03:19

  • Feature Branch changed from feature/8654-encode-apt-suite-in-git to feature/8654-encode-apt-suite-in-git-with-APT-overlays-dot-d

#16 Updated by anonym 2015-04-08 14:12:45

  • Status changed from In Progress to Fix committed
  • % Done changed from 30 to 100

Applied in changeset commit:c1cde38d4442ff59bfa9235e4a55e48ab1b123f2.

#17 Updated by anonym 2015-04-08 14:15:17

  • Status changed from Fix committed to In Progress
  • Assignee changed from anonym to intrigeri
  • % Done changed from 100 to 80
  • QA Check changed from Ready for QA to Dev Needed

I’ve merged this now, and leave the remaining things to you, intrigeri, per your email to tails-dev@.

#18 Updated by intrigeri 2015-04-08 14:43:52

experimental and feature/jessie branches adaptation done. Heads up email sent to -dev@. Now waiting for some Jenkins builds to complete before I can compare the resulting packages list, and then I’ll call this done.

#19 Updated by intrigeri 2015-04-08 15:21:25

  • Status changed from In Progress to Resolved
  • Assignee deleted (intrigeri)
  • % Done changed from 80 to 100
  • QA Check changed from Dev Needed to Pass

Packages lists haven’t changed in stable and devel => done!

#20 Updated by intrigeri 2015-05-29 11:36:31

  • blocks #8668 added

#21 Updated by sajolida 2015-08-05 09:33:03

  • Due date set to 2015-07-15

#22 Updated by intrigeri 2015-08-08 13:48:09

  • Deliverable for set to 266