From 5f915f33ba54b633bab9a11d80e9b4a3e100f091 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 1 Sep 2020 08:32:34 -0700 Subject: [PATCH] Update bindep and vhd-util install for arm64 These two change are required for arm64 but are also fine for x86 builds. Lets get these in before adding arm64 image jobs as it simplifies the juggling we have to do with the various fixes. Change-Id: I051bd0d80fa556111cb36d52391dca264f17015c --- Dockerfile | 2 +- bindep.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e04d63417..5252aea36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ RUN echo "nodepool ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/nodepool-sudo \ COPY tools/openstack-ci-core-ppa.asc /etc/apt/trusted.gpg.d/ RUN \ - echo "deb http://ppa.launchpad.net/openstack-ci-core/vhd-util/ubuntu bionic main" >> /etc/apt/sources.list \ + echo "deb http://ppa.launchpad.net/openstack-ci-core/vhd-util/ubuntu focal main" >> /etc/apt/sources.list \ && echo "deb http://ppa.launchpad.net/openstack-ci-core/debootstrap/ubuntu focal main" >> /etc/apt/sources.list \ && apt-get update \ && apt-get install -y \ diff --git a/bindep.txt b/bindep.txt index 79d2aa3a3..26a9ad5fb 100644 --- a/bindep.txt +++ b/bindep.txt @@ -10,7 +10,7 @@ libffi [platform:apk] libressl-dev [compile test platform:apk] libssl-dev [compile test platform:dpkg] linux-headers [compile test platform:apk] -make [compile test platform:apk] +make [compile test platform:apk platform:dpkg] musl-dev [compile test platform:apk] python3-dev [compile test platform:dpkg] python3-devel [compile test platform:rpm]