aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-25 09:36:28 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2020-06-25 09:36:28 +0000
commit661eedd787141a91115ea295e4e567523d6c3e42 (patch)
tree96f8a9b12b3e13336d671a76239841feebeb868a
parent84f60a52060994bdf225640e1a75ee46bffa828a (diff)
parent7ae267f4c17499904479a1d14cd3deb771d512df (diff)
Merge "Update keys and switch debian mirror"
-rw-r--r--packer/provision/agl_dependencies.sh8
-rw-r--r--packer/provision/agl_hwtest_dependencies.sh7
2 files changed, 11 insertions, 4 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index f5aa8a8c..9e2578cd 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -6,10 +6,14 @@ set -x
sudo su -c "echo 'deb http://archive.debian.org/debian jessie-backports main' >> /etc/apt/sources.list"
sudo su -c "echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until"
-sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 8B48AD6246925553
+
+sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 8B48AD6246925553 || true
# go
-sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com F6BC817356A3D45E
+sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com F6BC817356A3D45E || true
+
+sudo su -c "sed -i 's;http://archive.debian.org/debian;http://deb.debian.org/debian;' /etc/apt/sources.list"
+sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 || true
cat /etc/apt/sources.list
diff --git a/packer/provision/agl_hwtest_dependencies.sh b/packer/provision/agl_hwtest_dependencies.sh
index e031e90c..44688a6d 100644
--- a/packer/provision/agl_hwtest_dependencies.sh
+++ b/packer/provision/agl_hwtest_dependencies.sh
@@ -6,10 +6,13 @@ set -x
sudo su -c "echo 'deb http://archive.debian.org/debian jessie-backports main' >> /etc/apt/sources.list"
sudo su -c "echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until"
-sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 8B48AD6246925553
+sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 8B48AD6246925553 || true
# go
-sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com F6BC817356A3D45E
+sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com F6BC817356A3D45E || true
+
+sudo su -c "sed -i 's;http://archive.debian.org/debian;http://deb.debian.org/debian;' /etc/apt/sources.list"
+sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 || true
cat /etc/apt/sources.list