[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: add the bullseye-fasttrack repository

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
f2b217cb by Mattia Rizzolo at 2021-08-25T14:20:23+02:00
add the bullseye-fasttrack repository

Currently we are going to need it only for virtualbox in one host,
but I preferred to be more generic and add it everywhere for
consistency, since it's currently well maintained.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
1ad29567 by Mattia Rizzolo at 2021-08-25T14:38:03+02:00
install fasttrack-archive-keyring only on debian systems

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
b17f091b by Felix C. Stegerman at 2021-08-25T16:25:09+02:00
add Felix C. Stegerman <flx at obfusk.net> as maintainer

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


4 changed files:

- + authorized_keys/flx at obfusk.net.pub
- hosts/common/etc/apt/sources.list
- job-cfg/reproducible.yaml
- update_jdn.sh


Changes:

=====================================
authorized_keys/flx at obfusk.net.pub
=====================================
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIoPtC1zZFYM9ypeH3PXDAJzmC7sGf/J2Wfz94sBBOntAZKU7fymfjJ1rq2jHXSPdgF8ES/rNXrcj5hHWUEw9myjbqZtGIdGDojtw8NN+3PU3dWhjxdxrV6y09I1hAeRdik5MBhAcAJk6W/baIVkxKvFxhB2XCdxcqKx8zcslWd2SRupU+fBRaWxZSvWF/aZbrEhYQBSfa29BfIofHerJRE7l9K7V4BOh8OYfSC6I68f2v/PE8vmGhEuWmLaR78neTQHuDf6B7h3EAoHBDFDVOvsD62c1k2NHSyhqEIozAXUthHXzPw/L58NBcmlsB+1MRpTytpFM9v3vc6n0kkmPGHxwS6Y/0lfj+E73DQNcfE+Zjd5ZlXq+duKv/HUoCiQrNUvdG76buJYvCNhVmNkc9kGgcuX9en//HsyRLEzNOXg1M6JbhcVRzKB9yU0hIzO3ORVXCisfsBmTNUpMPuW0fj2wCXpoYnNdkupdAUrWkSC6nHWccP+InvyCRz5mksgSzgUAl7u80XpKiyqcmyUsb+Quxn7/QK7IWq0sDmzB9POvy2GsHeBF+5MGst2TyZw7OSBlVv7BPFyYt+UZQcIvHo1jE5AY2+ohkTU8mboRS5K4ZegmqtvZGjAGWAAp5JuCSfmsAlLiqzQ7IaThsukx8kvfyKHroLpqqObhpVH7XOQ== felix


=====================================
hosts/common/etc/apt/sources.list
=====================================
@@ -9,3 +9,5 @@ deb http://security.debian.org/debian-security bullseye-security main contrib no
 
 deb http://deb.debian.org/debian/ bullseye-backports main contrib non-free
 #deb-src http://deb.debian.org/debian/ bullseye-backports main contrib non-free
+
+deb https://fasttrack.debian.net/debian/ bullseye-fasttrack main contrib non-free


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -805,7 +805,7 @@
                     my_timed: '0 23 5,20 * *'
                     my_timed: ''
                     my_hname: 'osuosl168'
-                    my_recipients: 'jenkins+reproducible-changes qa-jenkins-scm at lists.alioth.debian.org hans at guardianproject.info michael.poehn at fsfe.org'
+                    my_recipients: 'jenkins+reproducible-changes qa-jenkins-scm at lists.alioth.debian.org hans at guardianproject.info michael.poehn at fsfe.org flx at obfusk.net'
                     my_blocker: '^reproducible.*fdroid.*'
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
 
@@ -818,7 +818,7 @@
                     my_description: 'Run tests on all the built APKs for F-Droid.'
                     my_timed: ''
             my_hname: 'osuosl168'
-            my_recipients: 'jenkins+reproducible-changes qa-jenkins-scm at lists.alioth.debian.org hans at guardianproject.info michael.poehn at fsfe.org'
+            my_recipients: 'jenkins+reproducible-changes qa-jenkins-scm at lists.alioth.debian.org hans at guardianproject.info michael.poehn at fsfe.org flx at obfusk.net'
             my_blocker: '^reproducible_fdroid.*'
             my_gitrepo: 'https://gitlab.com/fdroid/fdroidserver.git'
             my_scmpoll: '*/6 * * * *'


=====================================
update_jdn.sh
=====================================
@@ -128,6 +128,7 @@ user_host_groups['kpcyrd','osuosl170-amd64']="$sudo_groups"
 user_host_groups['kpcyrd','jenkins']="jenkins"
 user_host_groups['bubu','osuosl168-amd64']="$sudo_groups"
 user_host_groups['hans','osuosl168-amd64']="$sudo_groups"
+user_host_groups['flx','osuosl168-amd64']="$sudo_groups"
 user_host_groups['vagrant','*']="$sudo_groups"
 user_host_groups['bernhard','osuosl174-amd64']="$sudo_groups"
 user_host_groups['santiago','ionos3-amd64']="$sudo_groups"
@@ -296,7 +297,7 @@ $UP2DATE || echo "man-db man-db/auto-update boolean false" | sudo debconf-set-se
 #
 # install packages we need
 #
-# only on Debian systems
+# only on Debian-based systems
 if [ -f /etc/debian_version ] ; then
 	if [ $BASEDIR/$0 -nt $STAMP ] || [ ! -f $STAMP ] ; then
 		DEBS="
@@ -311,7 +312,6 @@ if [ -f /etc/debian_version ] ; then
 			devscripts
 			eatmydata
 			etckeeper
-			fasttrack-archive-keyring
 			figlet
 			git
 			gnupg
@@ -362,6 +362,7 @@ if [ -f /etc/debian_version ] ; then
 				" ;;
 			*)	# packages to be installed on all Debian systems but which are not available in Ubuntu 18.04:
 				DEBS="$DEBS
+				fasttrack-archive-keyring
 				ripgrep
 				mmdebstrap
 				" ;;



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4fa7d1f99f2726caa46b12a7aec7c78dda1e6b2e...b17f091baf015b509d66f0213f614837c6e9030e

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4fa7d1f99f2726caa46b12a7aec7c78dda1e6b2e...b17f091baf015b509d66f0213f614837c6e9030e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20210825/1296488e/attachment-0001.htm>