| Message ID | 20240426153938.1707723-2-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | testing/next: s390x gitlab updates | expand |
On 26/04/2024 17.39, Alex Bennée wrote: > Upgrading the s390x runner exposed some packages are not available for > it. Add an additional optional stage we only enable for arm64/x86_64 > for now. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > scripts/ci/setup/build-environment.yml | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml > index f344d1a850..de0d866a1e 100644 > --- a/scripts/ci/setup/build-environment.yml > +++ b/scripts/ci/setup/build-environment.yml > @@ -95,7 +95,6 @@ > - libpam0g-dev > - libpcre2-dev > - libpixman-1-dev > - - libpmem-dev > - libpng-dev > - libpulse-dev > - librbd-dev > @@ -107,7 +106,6 @@ > - libslirp-dev > - libsnappy-dev > - libspice-protocol-dev > - - libspice-server-dev > - libssh-dev > - libsystemd-dev > - libtasn1-6-dev > @@ -119,7 +117,6 @@ > - libvdeplug-dev > - libvirglrenderer-dev > - libvte-2.91-dev > - - libxen-dev > - libxml2-dev > - libzstd-dev > - llvm > @@ -156,6 +153,19 @@ > - ansible_facts['distribution'] == 'Ubuntu' > - ansible_facts['distribution_version'] == '22.04' > > + # not all packages are available for all architectures > + - name: Install additional packages to build QEMU on Ubuntu 22.04 > + package: > + name: > + - libpmem-dev > + - libspice-server-dev > + - libxen-dev > + state: present > + when: > + - ansible_facts['distribution'] == 'Ubuntu' > + - ansible_facts['distribution_version'] == '22.04' > + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' > + > - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04 > package: > name: Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index f344d1a850..de0d866a1e 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -95,7 +95,6 @@ - libpam0g-dev - libpcre2-dev - libpixman-1-dev - - libpmem-dev - libpng-dev - libpulse-dev - librbd-dev @@ -107,7 +106,6 @@ - libslirp-dev - libsnappy-dev - libspice-protocol-dev - - libspice-server-dev - libssh-dev - libsystemd-dev - libtasn1-6-dev @@ -119,7 +117,6 @@ - libvdeplug-dev - libvirglrenderer-dev - libvte-2.91-dev - - libxen-dev - libxml2-dev - libzstd-dev - llvm @@ -156,6 +153,19 @@ - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '22.04' + # not all packages are available for all architectures + - name: Install additional packages to build QEMU on Ubuntu 22.04 + package: + name: + - libpmem-dev + - libspice-server-dev + - libxen-dev + state: present + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['distribution_version'] == '22.04' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' + - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04 package: name:
Upgrading the s390x runner exposed some packages are not available for it. Add an additional optional stage we only enable for arm64/x86_64 for now. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- scripts/ci/setup/build-environment.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)