aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2020-07-01 14:32:24 +0200
committerCorentin LABBE <clabbe@baylibre.com>2020-07-01 14:32:24 +0200
commit425c0172a203628f69ffd8f676432ef8b80d27b1 (patch)
tree342961186ddddd9c3028b74e96944111b9af0a3d
parent154d2b4db41b03c40c880b54b241f82102e99958 (diff)
SPEC-3408: fix packer build
The current packer templates use 1604.4 which does not exists anymore, so change it to 1604.6. Furthermore, jessie-backports does not exists anymore and fail the whole build. Since apt-get-update fail (due to jessie-backports), the subsequent "&& apt-get install" is never executed Jessie-backports seems needed only for lava-tool which was replaced by lavacli, so no regrets, remove it. Change-Id: Iae1333a52a2dc20e9559462b4acf9a3b71696a08 Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
-rw-r--r--packer/provision/agl_dependencies.sh3
-rw-r--r--packer/provision/agl_hwtest_dependencies.sh3
-rw-r--r--packer/templates/basebuild-local-kvm.json4
3 files changed, 2 insertions, 8 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index 9e2578cd..a0e2e15e 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -3,7 +3,6 @@
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"
@@ -34,8 +33,6 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
python-pip python-simplejson g++-multilib make zip unzip iperf3 \
debian-keyring debian-archive-keyring python3-yaml pyhton3-pip
-DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1
-
# Adding stretch-backports for lavacli
echo "deb https://apt.lavasoftware.org/release stretch-backports main" >> /etc/apt/sources.list
diff --git a/packer/provision/agl_hwtest_dependencies.sh b/packer/provision/agl_hwtest_dependencies.sh
index 44688a6d..d950d49a 100644
--- a/packer/provision/agl_hwtest_dependencies.sh
+++ b/packer/provision/agl_hwtest_dependencies.sh
@@ -3,7 +3,6 @@
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 || true
@@ -30,8 +29,6 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
debian-keyring debian-archive-keyring \
python3-pip python3-yaml
-DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1
-
# Adding stretch-backports for lavacli
echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list
diff --git a/packer/templates/basebuild-local-kvm.json b/packer/templates/basebuild-local-kvm.json
index 6882b710..2f77dd44 100644
--- a/packer/templates/basebuild-local-kvm.json
+++ b/packer/templates/basebuild-local-kvm.json
@@ -13,8 +13,8 @@
"builders": [
{
"type": "qemu",
- "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.4-server-amd64.iso",
- "iso_checksum": "6a7f31eb125a0b2908cf2333d7777c82",
+ "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.6-server-amd64.iso",
+ "iso_checksum": "ac8a79a86a905ebdc3ef3f5dd16b7360",
"iso_checksum_type": "md5",
"output_directory": "output_ubuntu",