[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: unify common-armhf's sources.list with the common variant

[Mattia Rizzolo (@mattia)]

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


Commits:
32221d08 by Mattia Rizzolo at 2021-08-25T13:56:20+02:00
unify common-armhf's sources.list with the common variant

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

- - - - -
5bf2800e by Mattia Rizzolo at 2021-08-25T14:02:35+02:00
init_node: start with bullseye already

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

- - - - -
4fa7d1f9 by Mattia Rizzolo at 2021-08-25T14:04:09+02:00
install fasttrack-archive-keyring

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

- - - - -


4 changed files:

- − hosts/common-armhf/etc/apt/sources.list
- hosts/common/etc/apt/sources.list
- init_node
- update_jdn.sh


Changes:

=====================================
hosts/common-armhf/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ bullseye main contrib non-free
-#deb-src http://deb.debian.org/debian/ bullseye main contrib non-free
-
-deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ bullseye-updates main contrib non-free
-
-deb http://security.debian.org/debian-security bullseye-security main
-#deb-src http://security.debian.org/debian-security bullseye-security main
-
-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


=====================================
hosts/common/etc/apt/sources.list
=====================================
@@ -4,8 +4,8 @@ deb http://deb.debian.org/debian/ bullseye main contrib non-free
 deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
 #deb-src http://deb.debian.org/debian/ bullseye-updates main contrib non-free
 
-deb http://security.debian.org/ bullseye-security main contrib non-free
-#deb-src http://security.debian.org/ bullseye-security main contrib non-free
+deb http://security.debian.org/debian-security bullseye-security main contrib non-free
+#deb-src http://security.debian.org/debian-security bullseye-security main contrib non-free
 
 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


=====================================
init_node
=====================================
@@ -30,10 +30,11 @@ adduser --system --shell /bin/bash --home /home/jenkins-adm --ingroup jenkins-ad
 usermod -G jenkins jenkins-adm
 which sudo || apt-get install -y sudo
 echo '%jenkins-adm ALL= NOPASSWD: ALL' > /etc/sudoers.d/jenkins-adm # will be overwritten later
-grep -q buster-backports /etc/apt/sources.list || echo "deb http://deb.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list
+grep -q bullseye-backports /etc/apt/sources.list || echo "deb http://deb.debian.org/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list
 chown jenkins-adm.jenkins-adm /home/jenkins-adm
 cd ~jenkins-adm
-[ -x /usr/bin/git ] || apt-get install -y git
+# the keyring is needed as otherwise update_jdn will fail later
+[ -x /usr/bin/git ] || apt-get install -y git fasttrack-archive-keyring
 su jenkins-adm -l -c "git clone $GIT_REPO"
 cd jenkins.debian.net
 su jenkins-adm -l -c "git -C ~jenkins-adm/jenkins.debian.net config pull.ff only"


=====================================
update_jdn.sh
=====================================
@@ -311,6 +311,7 @@ if [ -f /etc/debian_version ] ; then
 			devscripts
 			eatmydata
 			etckeeper
+			fasttrack-archive-keyring
 			figlet
 			git
 			gnupg



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/239e3fdd6d84c90bd77da4fd2bf90b1bffb52dbe...4fa7d1f99f2726caa46b12a7aec7c78dda1e6b2e
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/6289406a/attachment-0001.htm>