- tbb-commits - lists.torproject.org

[tor-browser-bundle-testsuite/master] Bug 25101: Generate incremental mars for nightly builds
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 4261c714139e0d9896d17c92af54747f34bd9f9b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Dec 10 21:13:10 2019 +0100 Bug 25101: Generate incremental mars for nightly builds --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 58 +++++++++++++++++++++++++++++++ tmpl/details_make_incrementals.html | 1 + 2 files changed, 59 insertions(+) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index c52d5c4..d391bac 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -3,9 +3,11 @@ package TBBTestSuite::TestSuite::TorBrowserBuild; use strict; use parent 'TBBTestSuite::TestSuite::RBMBuild'; +use TBBTestSuite::Common qw(run_to_file); use TBBTestSuite::GitRepo; use File::Copy; use IO::CaptureOutput qw(capture_exec); +use Path::Tiny; sub description { 'Tor Browser Build'; @@ -15,6 +17,13 @@ sub type { 'tor-browser_build'; }; +sub test_types { + my $self = shift; + my $res = $self->SUPER::test_types(); + $res->{make_incrementals} = \&make_incrementals; + return $res; +} + sub set_tests { my ($testsuite) = @_; $testsuite->{tests} = [ @@ -32,6 +41,12 @@ sub set_tests { publish_dir => 'nightly-linux-x86_64', }, { + name => 'incrementals-nightly-linux-x86_64', + descr => 'create incrementals for tor-browser nightly linux-x86_64', + type => 'make_incrementals', + publish_dir => 'nightly-linux-x86_64', + }, + { name => 'nightly-linux-i686', descr => 'build tor-browser nightly linux-i686', type => 'rbm_build', @@ -44,6 +59,12 @@ sub set_tests { publish_dir => 'nightly-linux-i686', }, { + name => 'incrementals-nightly-linux-i686', + descr => 'create incrementals for tor-browser nightly linux-i686', + type => 'make_incrementals', + publish_dir => 'nightly-linux-i686', + }, + { name => 'nightly-windows-i686', descr => 'build tor-browser nightly windows-i686', type => 'rbm_build', @@ -56,6 +77,12 @@ sub set_tests { publish_dir => 'nightly-windows-i686', }, { + name => 'incrementals-nightly-windows-i686', + descr => 'create incrementals for tor-browser nightly windows-i686', + type => 'make_incrementals', + publish_dir => 'nightly-windows-i686', + }, + { name => 'nightly-windows-x86_64', descr => 'build tor-browser nightly windows-x86_64', type => 'rbm_build', @@ -68,6 +95,12 @@ sub set_tests { publish_dir => 'nightly-windows-x86_64', }, { + name => 'incrementals-nightly-windows-x86_64', + descr => 'create incrementals for tor-browser nightly windows-x86_64', + type => 'make_incrementals', + publish_dir => 'nightly-windows-x86_64', + }, + { name => 'nightly-osx-x86_64', descr => 'build tor-browser nightly osx-x86_64', type => 'rbm_build', @@ -80,6 +113,12 @@ sub set_tests { publish_dir => 'nightly-osx-x86_64', }, { + name => 'incrementals-nightly-osx-x86_64', + descr => 'create incrementals for tor-browser nightly osx-x86_64', + type => 'make_incrementals', + publish_dir => 'nightly-osx-x86_64', + }, + { name => 'nightly-android-armv7', descr => 'build tor-browser nightly android-armv7', type => 'rbm_build', @@ -130,6 +169,25 @@ sub set_tests { ]; } +sub make_incrementals { + my ($testsuite, $test) = @_; + $test->{results}{success} = 0; + mkdir 'nightly' unless -d 'nightly'; + # Clean the nightly directory + foreach my $subdir (path('nightly')->children) { + unlink $subdir if -l $subdir; + } + foreach my $builddir (path($testsuite->{publish_dir} . '/..')->children) { + if (-f "$builddir/$test->{publish_dir}/sha256sums-unsigned-build.txt") { + symlink("$builddir/$test->{publish_dir}", 'nightly/' . $builddir->basename); + } + } + my @cmd = ('make', 'incrementals-nightly'); + run_to_file("$testsuite->{'results-dir'}/$test->{name}.build.txt", @cmd) + or return; + $test->{results}{success} = 1; +} + sub pre_tests { my ($tbbinfos) = @_; my $gr = TBBTestSuite::GitRepo->new({ diff --git a/tmpl/details_make_incrementals.html b/tmpl/details_make_incrementals.html new file mode 120000 index 0000000..d9bb49c --- /dev/null +++ b/tmpl/details_make_incrementals.html @@ -0,0 +1 @@ +details_rbm_build.html \ No newline at end of file

1 0

[tor-browser-bundle-testsuite/master] Bug 25101: Set TORBROWSER_NIGHTLY_VERSION env variable
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 679ee355425b0cb4bf77626a8b16755c1c43db60 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Dec 10 20:13:18 2019 +0100 Bug 25101: Set TORBROWSER_NIGHTLY_VERSION env variable --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index 1389092..c52d5c4 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -149,6 +149,9 @@ sub pre_tests { return; } } + if ($tbbinfos->{tbb_version}) { + $ENV{TORBROWSER_NIGHTLY_VERSION} = $tbbinfos->{tbb_version}; + } } 1;

1 0

[tor-browser-build/master] Bug 25101: Add license and usage information to the prune-old-builds script
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 434a7d9e9ad8785c92a6dae014de990a9595c77f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 21:00:31 2019 +0100 Bug 25101: Add license and usage information to the prune-old-builds script --- .../roles/tbb-nightly-build/files/prune-old-builds | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds index 5d54229..1b4e30b 100755 --- a/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds +++ b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds @@ -1,4 +1,61 @@ #!/usr/bin/perl -w + +# Copyright (c) 2019, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +# 'prune-old-builds' is a script to prune old builds. +# +# +# Usage: +# $ ./prune-old-builds [options] <directory> +# +# +# Available options: +# +# --dry-run +# Don't delete anything, but say what would be deleted. +# +# --prefix <prefix> +# Prefix of the directories to be removed. Default is 'tbb-nightly-'. +# +# --days <n> +# Number of days that we should keep. Default is 6. +# +# --weeks <n> +# Number of monday builds that we should keep. Default is 3. +# +# --months <n> +# Number of 1st day of the month builds that we should keep. +# Default is 3. + use strict; use Getopt::Long; use DateTime;

1 0

[tor-browser-build/master] Bug 25101: Generate incremental mars for nightly builds
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 608fbb6f06237c0e0786b650433ca0c4cc203f72 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 11 00:15:33 2019 +0100 Bug 25101: Generate incremental mars for nightly builds Update testsuite_git_commit so that incremental mars are generated as part of our nightly builds. --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index f7f63f5..0a9e94a 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 3 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: d5e23151bf4ff48146c0c33355fe70def5e4d3f2 +testsuite_git_commit: ea0942f9da2bdbaf3f140f3baaed1bb56ee9af69 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser-build/master] Bug 25101: Keep 3 nightly builds
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 8489c017a01460d3e88e06dfc7a1edd3f02b71f8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 21:09:20 2019 +0100 Bug 25101: Keep 3 nightly builds In rbm.conf we currently have var/max_torbrowser_incremental_from set to 2. In order to be able to generate incrementals from the previous two versions, we need to keep 3 builds. --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 34d3929..f7f63f5 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -2,7 +2,7 @@ nightly_build_user: tbb-nightly nightly_build_cron_hour: 2 nightly_build_cron_minute: 20 -nightly_build_keep_builds: 2 +nightly_build_keep_builds: 3 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git testsuite_git_commit: d5e23151bf4ff48146c0c33355fe70def5e4d3f2

1 0

[tor-browser-build/master] Bug 25101: Change nightly builds directory to be the version
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 2d5508bfea59900b8d5952d895ac0e9610c70503 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 11 00:10:56 2019 +0100 Bug 25101: Change nightly builds directory to be the version To make generation of incremental mars easier, we use the version as the directory name (instead of just the date). We also define the tbb_version option, which is used to set the TORBROWSER_NIGHTLY_VERSION environment variable. --- .../roles/tbb-nightly-build/files/prune-old-builds | 17 +++++++++++------ .../roles/tbb-nightly-build/templates/start-tbb-nightly | 2 +- .../roles/tbb-nightly-build/templates/testsuite-config | 6 ++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds index 1b4e30b..852a9da 100755 --- a/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds +++ b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds @@ -44,7 +44,11 @@ # Don't delete anything, but say what would be deleted. # # --prefix <prefix> -# Prefix of the directories to be removed. Default is 'tbb-nightly-'. +# Prefix of the directories to be removed. Default is 'tbb-nightly.'. +# +# --separator <c> +# Separator character to separate the year, month, day in the directory +# names. Default is '.'. # # --days <n> # Number of days that we should keep. Default is 6. @@ -66,7 +70,8 @@ my %options = ( days => 6, weeks => 3, months => 3, - prefix => 'tbb-nightly-', + prefix => 'tbb-nightly.', + separator => '.', ); sub keep_builds { @@ -79,7 +84,7 @@ sub keep_builds { my $n = $options{days}; my $dt = DateTime->now; while ($n) { - $res{ $options{prefix} . $dt->ymd } = 1; + $res{ $options{prefix} . $dt->ymd($options{separator}) } = 1; $dt = $dt - $day; $n--; } @@ -89,7 +94,7 @@ sub keep_builds { $dt = $dt - $day; } while ($w) { - $res{ $options{prefix} . $dt->ymd } = 1; + $res{ $options{prefix} . $dt->ymd($options{separator}) } = 1; $dt = $dt - $week; $w--; } @@ -100,7 +105,7 @@ sub keep_builds { $dt = $dt - $day; } while ($m) { - $res{ $options{prefix} . $dt->ymd } = 1; + $res{ $options{prefix} . $dt->ymd($options{separator}) } = 1; $dt = $dt - $month; $m--; } @@ -113,7 +118,7 @@ sub clean_directory { my $k = keep_builds; chdir $directory || die "Error entering $directory"; foreach my $file (glob "$options{prefix}*") { - next unless $file =~ m/^$options{prefix}\d{4}-\d{2}-\d{2}$/; + next unless $file =~ m/^$options{prefix}\d{4}$options{separator}\d{2}$options{separator}\d{2}$/; next if $k->{$file}; if ($options{'dry-run'}) { print "Would remove $file\n"; diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly index c93bc94..fafc1d9 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -2,4 +2,4 @@ cd {{ testsuite_dir }} export RBM_NO_DEBUG=1 ./tbb-testsuite --config=tbb-nightly "$@" -/home/{{ nightly_build_user }}/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds +/home/{{ nightly_build_user }}/prune-old-builds --days {{ nightly_build_keep_builds }} ./tor-browser-builds diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config index c07c52c..90b08ac 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -5,6 +5,7 @@ use DateTime; use TBBTestSuite::TestSuite::TorBrowserBuild; my $date = DateTime->now->ymd; +my $tbb_version = 'tbb-nightly.' . DateTime->now->ymd('.'); my $name = "tor-browser-$date"; if (-d "$options->{'reports-dir'}/r/$name") { @@ -13,8 +14,9 @@ if (-d "$options->{'reports-dir'}/r/$name") { } my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ - publish_dir => "$FindBin::Bin/tor-browser-builds/$date", - publish_url => "{{ nightly_build_url }}/tor-browser-builds/$date", + tbb_version => $tbb_version, + publish_dir => "$FindBin::Bin/tor-browser-builds/$tbb_version", + publish_url => "{{ nightly_build_url }}/tor-browser-builds/$tbb_version", rbm_local_conf => "$FindBin::Bin/rbm-config/tbb-nightly.rbm.local.conf", make_clean => 1, });

1 0

[tor-browser-build/master] Bug 25101: Add the prune-old-builds script
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 073dfa5f7402b54cfe7772d71a1c931552908463 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 20:52:54 2019 +0100 Bug 25101: Add the prune-old-builds script Previously we were using the prune-old-builds script which was located in the testsuite repository in tools/prune-old-builds, as a git submodule. As this script is not used anywhere other than here, it doesn't make much sense to keep it as a separate git submodule. To simplify modification of this script, we move it here. --- .../roles/tbb-nightly-build/files/prune-old-builds | 74 ++++++++++++++++++++++ .../ansible/roles/tbb-nightly-build/tasks/main.yml | 7 ++ .../tbb-nightly-build/templates/start-tbb-nightly | 2 +- 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds new file mode 100755 index 0000000..5d54229 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds @@ -0,0 +1,74 @@ +#!/usr/bin/perl -w +use strict; +use Getopt::Long; +use DateTime; +use DateTime::Duration; +use File::Path qw(remove_tree); + +my %options = ( + days => 6, + weeks => 3, + months => 3, + prefix => 'tbb-nightly-', +); + +sub keep_builds { + my %res; + + my $day = DateTime::Duration->new(days => 1); + my $week = DateTime::Duration->new(weeks => 1); + my $month = DateTime::Duration->new(months => 1); + + my $n = $options{days}; + my $dt = DateTime->now; + while ($n) { + $res{ $options{prefix} . $dt->ymd } = 1; + $dt = $dt - $day; + $n--; + } + + my $w = $options{weeks}; + while ($dt->day_of_week != 1) { + $dt = $dt - $day; + } + while ($w) { + $res{ $options{prefix} . $dt->ymd } = 1; + $dt = $dt - $week; + $w--; + } + + my $m = $options{months}; + $dt = DateTime->now; + while ($dt->day != 1) { + $dt = $dt - $day; + } + while ($m) { + $res{ $options{prefix} . $dt->ymd } = 1; + $dt = $dt - $month; + $m--; + } + + return \%res; +} + +sub clean_directory { + my ($directory) = @_; + my $k = keep_builds; + chdir $directory || die "Error entering $directory"; + foreach my $file (glob "$options{prefix}*") { + next unless $file =~ m/^$options{prefix}\d{4}-\d{2}-\d{2}$/; + next if $k->{$file}; + if ($options{'dry-run'}) { + print "Would remove $file\n"; + } else { + remove_tree($file); + } + } +} + +my @opts = qw(days=i weeks=i months=i prefix=s dry-run!); +Getopt::Long::GetOptions(\%options, @opts); +die "Missing argument: directory to clean" unless @ARGV; +foreach my $dir (@ARGV) { + clean_directory($dir); +} diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml index 64d31a9..2c795b8 100644 --- a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -39,6 +39,13 @@ mode: 0644 owner: "{{ nightly_build_user }}" +- name: prune-old-builds + copy: + src: prune-old-builds + dest: "/home/{{ nightly_build_user }}/prune-old-builds" + mode: 0755 + owner: "{{ nightly_build_user }}" + - name: add start-tbb-nightly script template: src: start-tbb-nightly diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly index 3c1847d..c93bc94 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -2,4 +2,4 @@ cd {{ testsuite_dir }} export RBM_NO_DEBUG=1 ./tbb-testsuite --config=tbb-nightly "$@" -./tools/prune-old-builds/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds +/home/{{ nightly_build_user }}/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25101_v12'
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 16e629f680bbbe07a408a3022c3b819acd833bd2 Merge: b61a049 608fbb6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 18 13:58:26 2019 +0000 Merge remote-tracking branch 'boklm/bug_25101_v12' .../roles/tbb-nightly-build/defaults/main.yml | 4 +- .../roles/tbb-nightly-build/files/prune-old-builds | 136 +++++++++++++++++++++ .../ansible/roles/tbb-nightly-build/tasks/main.yml | 7 ++ .../tbb-nightly-build/templates/start-tbb-nightly | 2 +- .../tbb-nightly-build/templates/testsuite-config | 6 +- 5 files changed, 150 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 32750: Sign nightly sha256sums files with gpg
by gk＠torproject.org 17 Dec '19

17 Dec '19

commit 32ce9d2bf8bbd09017533175ffebf0b3599eb617 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 13 17:52:17 2019 +0100 Bug 32750: Sign nightly sha256sums files with gpg --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 1 + tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 0d19cff..8e4bc05 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -3,3 +3,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ]," +nightly_build_sign_build: 1 diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf index f83d8f3..4380480 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -45,12 +45,14 @@ var: local_conf: 1 ### The var/sign_build option defines if you want to sign the - ### sha256sums-unsigned-build.txt file with gpg. - #sign_build: 1 + ### sha256sums-unsigned-build.txt and + ### sha256sums-unsigned-build.incrementals.txt files with gpg. + {% if nightly_build_sign_build is defined %}sign_build: {{ nightly_build_sign_build }}{% endif %} + ### The var/sign_build_gpg_opts option can be used to define some gpg ### options to select the key to use to sign the sha256sums-unsigned-build.txt - ### file. + ### and sha256sums-unsigned-build.incrementals.txt files. #sign_build_gpg_opts: '--local-user XXXXXXXX' ### The clean configuration is used by the cleaning script to find the

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_32750_v4'
by gk＠torproject.org 17 Dec '19

17 Dec '19

commit b61a0497f0258ffebb2586c41267462e16a69cf0 Merge: 38624f8 32ce9d2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 17 20:09:03 2019 +0000 Merge remote-tracking branch 'boklm/bug_32750_v4' tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 1 + tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0