Skip to content
Snippets Groups Projects
Commit 05a3c0a4 authored by Simon McVittie's avatar Simon McVittie
Browse files

CI: Make autopkgtest wrapper script architecture-independent

parent a6a305d0
No related branches found
No related tags found
1 merge request!793Generalize CI to cover a non-special-case suite and architecture
...@@ -48,6 +48,17 @@ esac ...@@ -48,6 +48,17 @@ esac
# be able to get its source code # be able to get its source code
apt-get -y dist-upgrade apt-get -y dist-upgrade
primary_arch="$(dpkg --print-architecture)"
case "$primary_arch" in
(amd64|i386)
x86=yes
;;
(*)
x86=
;;
esac
# Install the packages under test. We're not too worried about # Install the packages under test. We're not too worried about
# minimal dependencies here # minimal dependencies here
dpkg -i \ dpkg -i \
...@@ -56,14 +67,14 @@ debian/tmp/artifacts/build/libsteam-runtime-tools-0-0-dbgsym_*_*.*deb \ ...@@ -56,14 +67,14 @@ debian/tmp/artifacts/build/libsteam-runtime-tools-0-0-dbgsym_*_*.*deb \
debian/tmp/artifacts/build/libsteam-runtime-tools-0-dev_*.deb \ debian/tmp/artifacts/build/libsteam-runtime-tools-0-dev_*.deb \
debian/tmp/artifacts/build/libsteam-runtime-tools-0-helpers_*.deb \ debian/tmp/artifacts/build/libsteam-runtime-tools-0-helpers_*.deb \
debian/tmp/artifacts/build/libsteam-runtime-tools-0-helpers-dbgsym_*_*.*deb \ debian/tmp/artifacts/build/libsteam-runtime-tools-0-helpers-dbgsym_*_*.*deb \
debian/tmp/artifacts/build/libsteam-runtime-tools-0-tests_*_amd64.deb \ debian/tmp/artifacts/build/libsteam-runtime-tools-0-tests_*_"$primary_arch".deb \
debian/tmp/artifacts/build/pressure-vessel-relocatable_*_amd64.deb \ debian/tmp/artifacts/build/pressure-vessel-relocatable_*_"$primary_arch".deb \
debian/tmp/artifacts/build/pressure-vessel-relocatable-dbgsym_*_amd64.*deb \ debian/tmp/artifacts/build/pressure-vessel-relocatable-dbgsym_*_"$primary_arch".*deb \
debian/tmp/artifacts/build/pressure-vessel-libs*.deb \ ${x86:+debian/tmp/artifacts/build/pressure-vessel-libs*.deb} \
debian/tmp/artifacts/build/steam-runtime-tools-bin_*_amd64.deb \ debian/tmp/artifacts/build/steam-runtime-tools-bin_*_"$primary_arch".deb \
debian/tmp/artifacts/build/steam-runtime-tools-bin-dbgsym_*_amd64.*deb \ debian/tmp/artifacts/build/steam-runtime-tools-bin-dbgsym_*_"$primary_arch".*deb \
debian/tmp/artifacts/build/steam-runtime-tools-minimal_*_amd64.deb \ debian/tmp/artifacts/build/steam-runtime-tools-minimal_*_"$primary_arch".deb \
debian/tmp/artifacts/build/steam-runtime-tools-minimal-dbgsym_*_amd64.*deb \ debian/tmp/artifacts/build/steam-runtime-tools-minimal-dbgsym_*_"$primary_arch".*deb \
${NULL+} ${NULL+}
apt-get -y -f install apt-get -y -f install
......
...@@ -25,6 +25,7 @@ fi ...@@ -25,6 +25,7 @@ fi
--archive "${AUTOPKGTEST_ARTIFACTS}" --archive "${AUTOPKGTEST_ARTIFACTS}"
"$PYTHON" ./tests/pressure-vessel/relocatable-install.py \ "$PYTHON" ./tests/pressure-vessel/relocatable-install.py \
--multiarch-tuple="$multiarch" \
"${AUTOPKGTEST_TMP}/relocatable-install" "${AUTOPKGTEST_TMP}/relocatable-install"
for archive in "${AUTOPKGTEST_ARTIFACTS}"/*.tar.*; do for archive in "${AUTOPKGTEST_ARTIFACTS}"/*.tar.*; do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment