Feature #16154

Merge USB image generation into master

Added by intrigeri 2018-11-26 13:06:22 . Updated 2018-11-27 16:17:57 .

Status:
Resolved
Priority:
High
Assignee:
Category:
Build system
Target version:
Tails_3.11
Start date:
2018-11-26
Due date:
% Done:

100%

Feature Branch:
feature/15292-generate-usb-image
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:
316

Description

To simplify the work on our infra, let’s merge the USB image generation changes into master so all branches behave the same.

segfault has prepared a topic branch already but it needs a little bit more work:

  • the most recent relevant work done on feature/15292-usb-image is not there yet
  • some of the work done recently on feature/15292-usb-image was applied there in batch via non-atomic commits (at least commit:daaf326952d41a1afede41f42ce7ac6f8c7d05a6) which will make our Git history hard to follow
  • finally, feature/15292-usb-image must be rebased on top of that new branch so we don’t end up with duplicate commits

I’ll do this ASAP in order to merge this branch into master and unblock the CI work that starts tomorrow.

Subtasks

History

#1 Updated by intrigeri 2018-11-27 11:39:28

  • Status changed from Confirmed to In Progress
  • % Done changed from 0 to 50
  • QA Check set to Ready for QA
  • Feature Branch changed from usb-image-generation to feature/15292-generate-usb-image

I’ve prepared two branches:

  • feature/15292-generate-usb-image: based on master; once I’ve seen it build successfully I’ll merge into master; everything that only affects build time is should go there so we can keep merging it into master
  • feature/15292-repartition: based on feature/15292-generate-usb-image; meant to be merged into devel by Dec 15; everything that affects Tails runtime should go there; feature/15292-generate-usb-image should be merged into this one whenever it changes

#2 Updated by intrigeri 2018-11-27 12:13:03

Forgot to say: I’ve verified that if I merge feature/15292-repartition into current devel, the result is identical (modulo APT snapshots mangling) to the previous feature/15292-usb-image. I think this validates my history rewriting.

#3 Updated by intrigeri 2018-11-27 16:17:57

  • Status changed from In Progress to Resolved
  • Assignee deleted (intrigeri)
  • % Done changed from 50 to 100
  • QA Check deleted (Ready for QA)

Done! feature/15292-usb-image is now deprecated.