summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | Merge remote-tracking branch 'origin/stable' into ↵intrigeri2016-07-13511-17326/+7447
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/testing' into ↵anonym2016-06-08159-8898/+15070
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * | | | | | | | Revert "Disable WebM test since the feature is broken in the Tor Browser."anonym2016-06-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 08c08e67937f3d6fadd266dc2ab43c0877b2963e. With more than 1 core in the tester VM, WebM is no longer broken in Tails, so the test can be enabled again. Refs: #6729, #11507
| | | | * | | | | | | | Merge remote-tracking branch 'origin/testing' into ↵anonym2016-06-06214-6031/+10033
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ Merge branch 'test/10497-tor-bootstrap-is-fragile' into ↵intrigeri2016-05-2711-31/+31
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into ↵intrigeri2016-05-23409-2578/+53210
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'test/10497-tor-bootstrap-is-fragile' into ↵intrigeri2016-05-217-4/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'test/10497-tor-bootstrap-is-fragile' into ↵intrigeri2016-05-1921-48/+17
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into ↵intrigeri2016-05-17527-20547/+12462
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into ↵intrigeri2016-05-141134-34490/+40003
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into ↵intrigeri2016-02-261150-100357/+23308
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10971-more-CPUs-for-TailsToaster
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'devel' into test/10971-more-CPUs-for-TailsToasterintrigeri2016-01-26305-7588/+11277
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'test/11588-usb-on-jenkins+10733' into ↵intrigeri2016-08-231-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/from-intrigeri-for-2.6
| | | | * | | | | | | | | | | | | | | | | Merge branch 'stable' into test/11588-usb-on-jenkins+10733intrigeri2016-08-2351-235/+900
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge branch 'feature/10298-linux-4.x-aufs-kaslr' into ↵intrigeri2016-08-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/from-intrigeri-for-2.6
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'feature/10298-linux-4.x-aufs' into ↵intrigeri2016-08-141-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/10298-linux-4.x-aufs-kaslr
| | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'feature/10298-linux-4.x-aufs-kaslr' and ↵intrigeri2016-08-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/10190-OpenPGP-applet-from-Debian' into feature/from-intrigeri-for-2.6
| | | | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/devel' into ↵intrigeri2016-08-08775-29920/+17229
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/10190-OpenPGP-applet-from-Debian
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'feature/10298-linux-4.x-aufs' into ↵intrigeri2016-08-08309-13285/+10134
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/10298-linux-4.x-aufs-kaslr
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into feature/from-intrigeri-for-2.6intrigeri2016-08-0854-535/+898
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'test/11588-usb-on-jenkins+10733' into ↵intrigeri2016-08-022-0/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/from-intrigeri-for-2.6
| | | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'stable' into test/11588-usb-on-jenkins+10733intrigeri2016-08-02260-12722/+9233
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | *-------. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branches 'origin/feature/5650-rngd', ↵intrigeri2016-08-0195-15658/+448
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | / / / / / / / / / / / / / / / / / / | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | / / / / / / / / / / / / / / / / | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | 'origin/feature/10298-linux-4.x-aufs-kaslr', 'origin/feature/11351-tor-0.2.8', 'origin/feature/10190-OpenPGP-applet-from-Debian' and 'origin/test/11588-usb-on-jenkins+10733' into feature/from-intrigeri-for-2.6
| | | | | | | | * | | | | | | | | | | | | | | | | | | Merge branch 'test/11588-usb-on-jenkins' into test/11588-usb-on-jenkins+10733intrigeri2016-07-301-2/+2
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | | | | | | | | Test suite: take into account that only 3040 MiB of RAM is detected since we ↵intrigeri2016-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switched to pc-i440fx-2.5.
| | | | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'bugfix/10733-run-memory-erasure-hook-earlier' into ↵intrigeri2016-07-294-5/+16
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/11588-usb-on-jenkins+10733
| | | | | | | | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/stable' into ↵intrigeri2016-07-192-11/+4
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/10733-run-memory-erasure-hook-earlier
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into ↵intrigeri2016-07-15527-17548/+13875
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/10733-run-memory-erasure-hook-earlier
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/testing' into ↵intrigeri2016-06-07243-11099/+11829
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/10733-run-memory-erasure-hook-earlier
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | Update design doc.intrigeri2016-06-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs: #10733
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'test/10776-fragile-memory_wipe' into ↵intrigeri2016-06-011-4/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/10733-run-memory-erasure-hook-earlier
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into test/10776-fragile-memory_wipeintrigeri2016-06-012322-150475/+119714
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'devel' into test/10776-fragile-memory_wipeintrigeri2016-01-26195-6661/+9275
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/testing' into ↵intrigeri2016-01-251034-6041/+94207
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/10776-fragile-memory_wipe
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Revert "Test suite: mark scenarios that wipe memory as fragile."intrigeri2015-12-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 24b59bf21447968731e1583987624812af2359f7. refs: #10776
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Add memory_wipe to the prereqs of all init-top initramfs scripts that are ↵intrigeri2016-06-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not ours. This is the only way to have guarantees as to the order in which those scripts are executed. The practical effect is that when erasing memory, our memory_wipe script will be run first, and since it shuts down the system in the end, none of the other init-top scripts will be executed. refs: #10733
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Run our initramfs memory erasure hook earlier.intrigeri2016-06-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal here is to: * save a few seconds on shutdown (it might matter especially for the emergency one); * work in a less heavily multitasking / event-driven environment, for more robust operation. refs: #10733
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Test suite: update setup doc to pull QEMU from jessie-backports.intrigeri2016-07-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use a machine template that was introduced in QEMU 2.5.
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Test suite: use more recent virtual hardware, i.e. USB 3.0 (nec-xhci) on a ↵intrigeri2016-07-293-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pc-i440fx-2.5 machine. I have some vague hope that switching USB controllers might help with problems we see on Jenkins when booting from USB (refs: #11588). This change requires upgrading the machine type as well, QEMU otherwise won't boot from this USB 3.0 controller. And while we're at it, let's migrate from IDE to SATA, in order to reflect better hardware Tails is being used with. Also, there are chances that more recent virtual hardware sees more testing these days, so it sounds potentially useful to "upgrade". Note that I've initially tried the more modern pc-q35-2.5 machine type, which worked fine when running the test suite on a sid host, but when running on Jessie the VM under testing crashed when logging into GNOME. I'll file a ticket about trying this again once Stretch is out.
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Unmark all scenarios that use Tails Installer as fragile.intrigeri2016-07-299-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/11590-installer-robustness was based on this branch (bugfix/10720-installer-freezes-on-jenkins), and flagged the tests as fragile again, so we have to revert that on this branch so these tests run on Jenkins again. refs: #10720 This reverts the following commits: 3c02ea74788cffe0b4db21181f46778eab0689b5 20d07239a8e2c3706827edcf3b17266899c37a64 2c4c6434c0c6bdcf2534f966434bf92230af3698
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/stable' into ↵intrigeri2016-07-2911-15/+51
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/11590-installer-robustness
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Only mark the single affected scenario as fragile.intrigeri2016-07-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings this branch back to the current stable branch's state, which makes sense.
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Drop version-based APT pinning for Tails Installer.intrigeri2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That pinning has been useful for #10720 so far, but we don't want to merge it into one of our release branches. And once this branch is merged into one of our release branches, and flows into the branch for refs: #11590
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Test suite: mark "Scenario: Tails shuts down on USB boot ↵intrigeri2016-07-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | medium removal" as fragile."" This reverts commit bfb67b1ef29e62fea439176c04e16c91ee0b3f46. refs: #11590
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Mark as fragile all tests that rely on Tails Installer.""intrigeri2016-07-228-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 47d9d43faf498d00e3ef09fdacd1c2e1119121e0. refs: #11590
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/test/10504-allow-more-boot_devices' ↵intrigeri2016-07-221-9/+7
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bugfix/10720-installer-freezes-on-jenkins
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch ↵anonym2016-06-1613-40/+15
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'origin/bugfix/10720-installer-freezes-on-jenkins' into test/10504-allow-more-boot_devices
| | | | | | | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into ↵intrigeri2016-07-2110-35/+83
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/10720-installer-freezes-on-jenkins
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump APT pinning to install newer tails-installer WIP package.intrigeri2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs: #10720
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Test suite: give the system under testing 2 vCPUs."intrigeri2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ad96a3558908a1aabd1456e06bf6b06e36ea923. Whenever we go back to that experiment (#6729), we should do it in another branch.