Bug #10582
merge_from_torbrowser-launcher_upstream Jenkins job is not testing what it should
0%
Description
The ISO build failures we see are about conflicts between our own patch and what’s in Debian testing. We’re testing merging upstream into our own branch.
Once this is fixed, we should revert commit 39158ca in our jenkins-jobs repo.
Subtasks
Related issues
Related to Tails - |
Resolved | 2015-02-04 | |
Related to Tails - |
Resolved | 2016-02-08 |
History
#1 Updated by intrigeri 2015-11-19 04:18:27
- related to
Feature #8854: Set up a daily Jenkins job that tries to merge upstream torbrowser-launcher's master branch into our own one added
#2 Updated by intrigeri 2015-11-19 04:34:02
The initial goal was to give us a head start, during the sid->testing transition time, to realize we had to prepare for change. So perhaps this test should do exactly what our build system does, except it would apt-get source torbrowser-launcher/sid
instead of /testing
. This could be done in addition to what we already do (that is useful in itself, to detect even earlier upstream changes that’ll break our stuff).
#3 Updated by intrigeri 2015-12-14 09:34:57
- Target version changed from Tails_1.8 to Tails_2.0
If I don’t manage to deal with it by the end of the year, I’ll drop the target version.
#5 Updated by intrigeri 2016-02-08 12:20:34
- related to
Bug #11078: Fail to build ISO since torbrowser-launcher 0.2.2-3 reached Debian testing added
#6 Updated by intrigeri 2016-02-08 12:33:15
I’m starting to think that the problem is rather that we should maintain our profile as a fork of the upstream one, instead of as a fork of the one shipped in Debian: the changes applied in Debian are rarely relevant for us, and they should be upstreamed anyway. A Git submodule tracking our own torbrowser-launcher Git repo would be one way to do it: we would regularly merge upstream into that repo, Jenkins would tell us in advance when the merge would start failing, and at ISO build time we merely have to cp
the profile to the right place in the config tree.
#7 Updated by intrigeri 2017-03-28 19:07:11
- Description updated
Disabled the job, that’s been broken for months.
#8 Updated by intrigeri 2019-04-07 08:43:18
- Assignee deleted (
intrigeri)
I probably won’t work on this any time soon.
I recommend anyone willing to work on this to do it with GitLab CI and not with our private Jenkins.