Bug #15999

Integrate USB image in the release process

Added by Anonymous 2018-09-28 10:44:54 . Updated 2019-03-15 11:08:58 .

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Target version:
Start date:
2018-11-28
Due date:
% Done:

100%

Feature Branch:
doc/15999-integrate-usb-image-in-the-release-process
Type of work:
Contributors documentation
Blueprint:

Starter:
Affected tool:
Deliverable for:
316

Description

Review & rubber-duck: kibi (3h)

This includes at least:

  • adjust manual test suite
  • what about UDFs? the full upgrade path only includes the ISO it’s not used anyway so we don’t care, see details in commit:2d7cf8ac4308e290c4a3872fd80fd60b5e6ed459
  • upload to iso-archive
  • upload to rsync server
  • 2 torrent files
  • wiki/src/inc/* as requested by doc writers, see Bug #16163
  • IDF:
    • adapt IDF generation
    • git grep install/v1
    • coordinate v1 vs. v2 IDF generation (both for some time?) with the release of the updated Verification Extension + the Installation Assistant version check for that extension
  • probably more stuff that we’ll discover along the way

Subtasks

Bug #16164: Adjust release process for new build artifacts naming scheme Resolved

100

Bug #16171: Get our master branch ready for IDF v2 and new Tails Verification extension Resolved

100


Related issues

Blocked by Tails - Bug #16163: Clarify updated release process requirements for USB image Resolved 2018-11-28
Blocked by Tails - Bug #16112: Confusing signature date on website doc Resolved 2018-11-09

History

#1 Updated by intrigeri 2018-10-12 14:19:41

  • Estimated time set to 3 h
  • Type of work changed from Wait to Contributors documentation

#2 Updated by intrigeri 2018-10-12 14:20:04

  • Description updated

#3 Updated by intrigeri 2018-10-12 14:20:36

  • Subject changed from Release Process for USB Images to Integrate USB image in the release process

#4 Updated by intrigeri 2018-11-20 09:34:48

  • Description updated

#5 Updated by intrigeri 2018-11-20 09:46:31

  • Description updated

#6 Updated by intrigeri 2018-11-27 13:02:26

  • Description updated

#7 Updated by intrigeri 2018-11-27 13:03:21

  • Description updated

#8 Updated by intrigeri 2018-11-27 13:39:53

  • Status changed from Confirmed to In Progress

Applied in changeset commit:tails|a4c66f88daea593bb31efa99ecc7af3b7d01ce85.

#9 Updated by intrigeri 2018-11-27 13:41:11

  • Description updated
  • Feature Branch set to doc/15999-integrate-usb-image-in-the-release-process

#10 Updated by intrigeri 2018-11-28 11:58:22

  • blocked by Bug #16163: Clarify updated release process requirements for USB image added

#11 Updated by intrigeri 2018-11-28 12:17:20

  • Description updated

#12 Updated by intrigeri 2018-11-28 12:18:53

  • Description updated

#13 Updated by intrigeri 2018-11-28 12:34:27

  • Description updated

#14 Updated by intrigeri 2018-11-29 09:09:38

  • blocked by Bug #16112: Confusing signature date on website doc added

#15 Updated by intrigeri 2018-11-29 16:29:24

  • Description updated

#16 Updated by intrigeri 2018-11-29 17:11:43

  • Assignee changed from intrigeri to CyrilBrulebois
  • QA Check set to Ready for QA

OK, I’ve done all I could think of or spot via git grep’ing the world. This branch should not be merged anywhere yet (the other bits of the USB image project are not ready and we have no integration branch yet, where we would merge doc + test suite + this kind of updates). So please first focus on reviewing my work on the 2 subtasks, that needs to be merged more urgently. Then you can review the branch for this very ticket and once happy, reassign to me: I’ll coordinate merging with Bug #16112 and with the rest of the USB image.

If you have nitpicks or improvements in mind, feel free to commit and push them directly to the topic branch, to save both of us some time :)

Thanks in advance!

#17 Updated by intrigeri 2018-11-29 17:13:32

  • Description updated

#18 Updated by intrigeri 2018-12-07 21:12:14

intrigeri wrote:
> once happy, reassign to me: I’ll coordinate merging with Bug #16112 and with the rest of the USB image.

The branch for Bug #16112 was merged so I’ll merge this here tomorrow and will resolve merge conflicts, but that should not prevent you from reviewing the branch if you’re faster than me.

#19 Updated by intrigeri 2018-12-07 21:13:24

(And in any case, this can wait a little bit longer than Bug #16164, no big hurry here, feel free to postpone to post-3.11 if needed.)

#20 Updated by intrigeri 2018-12-08 06:45:25

intrigeri wrote:
> intrigeri wrote:
> > once happy, reassign to me: I’ll coordinate merging with Bug #16112 and with the rest of the USB image.

Still the case.

> The branch for Bug #16112 was merged so I’ll merge this here tomorrow and will resolve merge conflicts

Done!

#21 Updated by intrigeri 2018-12-10 09:02:51

  • Target version changed from Tails_3.11 to Tails_3.12

Can wait until post-3.11 :)

#22 Updated by Anonymous 2019-01-08 10:57:35

Hi Cyril, could you try to review this for January 21st latest delay please?
We need this to be done on February 1st and I would like to leave some time for intrigeri in case something needs fixing after the review. Thanks!

#23 Updated by CyrilBrulebois 2019-01-13 20:52:39

  • Assignee changed from CyrilBrulebois to intrigeri
  • QA Check changed from Ready for QA to Dev Needed

In commit:dcf9d89534648d0e876ad670fbf276e1aab72122 wrong flag:

--old-img doesn’t exist; setting --old-iso is sufficient (speaking of that, the sub call used to get the IMG filename out of the ISO one could probably check for ‘$’…)

In commit:609d0f7778c0c3c349e87ea2f7454f2ee37dee6d extra ‘a’:

+Build and compare a Tails ISO and USB images

and this is strange:

-        mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso*" \
+        mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.*" \

Are we sure we’re capturing everything we want here? See commit:dc65b233bb47a2e502c06c0bc73837c7da6c6efd for stuff I had in mind while writing this very question.

In commit:5273b9cf0545c6148275f3d547bab11d6e92c8e5 I’d use the Oxford comma for Publish the ISO, IMG and IUKs over HTTP and ISO, USB image and IUK (and add an ‘s’ to the latter); but colours and tastes…

In commit:9d916c91c76c6608e40f6e9c368756b7e948443f I think the transmission-show call is missing the .${type:?} addition?

Also, having distinct stable_amd64_iso_gpg_signature_output.html and stable_amd64_img_gpg_signature_output.html files is likely to be an issue with the current state of the website, given the latter only includes:

   <p class="pre">[[!inline pages="inc/stable_amd64_gpg_signature_output" raw="yes" sort="age"]]</p>

but that’s maybe tracked in another ticket? (I see plenty of other occurrences about the ISO only, be it in install or upgrade pages.)

Switching back to “Dev Needed” for the --old-img and the transmission-show points at least.

#24 Updated by intrigeri 2019-01-14 09:58:42

  • Assignee changed from intrigeri to CyrilBrulebois
  • QA Check changed from Dev Needed to Ready for QA

Thanks for the review!

> --old-img doesn’t exist; setting --old-iso is sufficient

Good catch! Failed attempt at documentation driven development :) Fixed.

> In commit:609d0f7778c0c3c349e87ea2f7454f2ee37dee6d extra ‘a’:

Fixed.

> and this is strange:

>

> -        mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso*" \
> +        mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.*" \
> 

> Are we sure we’re capturing everything we want here? See commit:dc65b233bb47a2e502c06c0bc73837c7da6c6efd for stuff I had in mind while writing this very question.

Yes, I think we’re capturing what we need here (and probably more e.g. files that previously had no .iso component in their name). This doc has not been tested yet, bet it in its previous form or in the new one. I’m supposed to be the TR for 3.11 but I’m failing (Bug #12629) so it’s likely that I’ll play the TR for 3.12 and will thus test this updated doc. If I’m guessing wrong here, I’ll notice and fix it. Deal?

> In commit:5273b9cf0545c6148275f3d547bab11d6e92c8e5 I’d use the Oxford comma

Done.

> In commit:9d916c91c76c6608e40f6e9c368756b7e948443f I think the transmission-show call is missing the .${type:?} addition?

Indeed, fixed.

> Also, having distinct stable_amd64_iso_gpg_signature_output.html and stable_amd64_img_gpg_signature_output.html files is likely to be an issue with the current state of the website, given the latter only includes:

>

>    <p class="pre">[[!inline pages="inc/stable_amd64_gpg_signature_output" raw="yes" sort="age"]]</p>
> 

This was fixed already on our integration branch (as part of the doc update work), which I hadn’t merged into my topic branch for a while. After updating my topic branch:

$ git grep gpg_signature_output wiki/src/**/*.{mdwn,html}
wiki/src/contribute/release_process.mdwn:          "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html" && \
wiki/src/contribute/release_process.mdwn:          "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_img_gpg_signature_output.html"
wiki/src/contribute/release_process.mdwn:               inc/stable_amd64_img_gpg_signature_output.html
wiki/src/contribute/release_process.mdwn:               inc/stable_amd64_iso_gpg_signature_output.html
wiki/src/install/expert/usb.mdwn:   <p class="pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
wiki/src/install/inc/steps/download.inline.html:   <p class="windows linux mac upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
wiki/src/install/inc/steps/download.inline.html:   <p class="dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>

… looks good!

Note that I had to resolve a few conflicts during this merge operation.

> (I see plenty of other occurrences about the ISO only, be it in install or upgrade pages.)

I think that was caused by the same reason (topic branch lagging behind the integration branch and thus not having the doc update merged in). Can you please check again and point me to specific issues that might be left?

#25 Updated by intrigeri 2019-01-14 18:47:04

Merged into feature/15292-usb-image because this is already better than what we had there.

#26 Updated by Anonymous 2019-01-29 10:57:04

>> (I see plenty of other occurrences about the ISO only, be it in install or upgrade pages.)

> I think that was caused by the same reason (topic branch lagging behind the integration branch and thus not having the doc update merged in). Can you please check again and point me to specific issues that might be left?

This is the last remaining bit on this ticket it seems. I’m fine with resolving this after the release.

#27 Updated by Anonymous 2019-01-29 11:02:28

  • Target version changed from Tails_3.12 to Tails_3.13

#28 Updated by Anonymous 2019-03-04 14:53:52

@CyrilBrulebois can you please verify what’s really left to do here? It seems not much and we might already close this ticket. Thanks!

#29 Updated by intrigeri 2019-03-15 11:08:58

  • Status changed from In Progress to Resolved
  • Assignee deleted (CyrilBrulebois)
  • QA Check deleted (Ready for QA)

@CyrilBrulebois, please reopen if you spot any USB image -related issue during the 3.13 release process.