Feature #9601

Add a merge step to our Jenkins ISO build process

Added by bertagaz 2015-06-17 03:37:39 . Updated 2015-09-15 11:59:40 .

Continuous Integration
Target version:
Start date:
Due date:
% Done:


Feature Branch:
Type of work:

Affected tool:
Deliverable for:


In our automatic builds specs, we designed that we wanted the build of feature branches to be done after it has been merged locally in their base branch.

We still need to implement this, as at the moment we only build from the feature branch.

This will probably mean modifying our vagrant/provision/assets/build-tails script.



#1 Updated by bertagaz 2015-06-17 03:38:38

#2 Updated by bertagaz 2015-06-17 05:43:32

  • Priority changed from Normal to Elevated

#3 Updated by bertagaz 2015-06-17 06:30:01

  • Assignee changed from bertagaz to intrigeri

We’ll probably need to use some of the auto/scripts/tails-custom-apt-sources functions in the vagrant/provision/assets/build-tails script, namely base_branch and friends.

To avoid code duplication we should put this functions in a separate shell lib.

I guess the best place is in the lib/ folder of the Tails repo, where the pythonlib already lay.

We should create a lib/shell folder in the Tails git repo, but is it required to create a dedicated submodule as the pythonlib? Or should we wait until it grows?

#4 Updated by intrigeri 2015-06-18 02:07:57

  • Assignee changed from intrigeri to bertagaz
  • QA Check set to Info Needed

I’m confused: it seems that what you’re asking for was done a few months ago, see e.g. commit:b0fbe52. What’s missing exactly?

#5 Updated by bertagaz 2015-06-18 02:30:40

  • Status changed from Confirmed to Rejected
  • Assignee deleted (bertagaz)

Awesome! I haven’t seen it because I only thought to have a look to the build-tails script, and not the auto/build one.

So nothing is missing, closing this ticket then, thx.

#6 Updated by bertagaz 2015-06-19 01:50:55

  • blocks #8668 added

#7 Updated by intrigeri 2015-08-26 06:11:52

  • Deliverable for set to 266

#8 Updated by intrigeri 2015-09-15 11:59:32

  • blocked by deleted (#8668)

#9 Updated by intrigeri 2015-09-15 11:59:40

  • Deliverable for deleted (266)