aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2022-07-08 14:52:17 +0200
committerOliver Smith <osmith@sysmocom.de>2022-07-08 15:35:14 +0200
commit56d1a172d6f959932550e264bc20352ab035d026 (patch)
treeace78da6721c3dfaa3eb4cb1efa814482d04df38
parent6135bf1bc4328ab430e8f798672e3cfb4437e973 (diff)
scripts/repo-install-test: add debian 11, drop 9
-rwxr-xr-xscripts/repo-install-test.sh2
-rw-r--r--scripts/repo-install-test/blacklist_debian11.txt70
-rw-r--r--scripts/repo-install-test/blacklist_debian9.txt27
-rwxr-xr-xscripts/repo-install-test/run-inside-docker.sh24
4 files changed, 89 insertions, 34 deletions
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index d13cfc8..6b14cf2 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -11,8 +11,8 @@
DISTRO="$1"
DISTROS="
centos8
- debian9
debian10
+ debian11
"
check_usage() {
diff --git a/scripts/repo-install-test/blacklist_debian11.txt b/scripts/repo-install-test/blacklist_debian11.txt
new file mode 100644
index 0000000..53187dc
--- /dev/null
+++ b/scripts/repo-install-test/blacklist_debian11.txt
@@ -0,0 +1,70 @@
+# These packages will not get explicitly installed in this test.
+# Package lines must have nothing but the package (no comment,
+# no additional space etc).
+
+# OpenBSC
+# This is legacy, we aren't really interested in testing openbsc.git
+# derived packages. Packages are found in openbsc/debian/control.
+openbsc-dev
+osmo-bsc-mgcp
+osmo-bsc-mgcp-dbg
+osmocom-bs11-utils
+osmocom-bs11-utils-dbg
+osmocom-bsc-nat
+osmocom-bsc-nat-dbg
+osmocom-bsc-sccplite
+osmocom-bsc-sccplite-dbg
+osmocom-ipaccess-utils
+osmocom-ipaccess-utils-dbg
+osmocom-nitb
+osmocom-nitb-dbg
+
+# Causing conflicts, not relevant for the test
+liblimesuite20.10-1-dbgsym
+liborcania1.2
+liborcania1.2-dbgsym
+liborcania2.1
+liborcania2.1-dbgsym
+libulfius2.5
+libulfius2.5-dbgsym
+libulfius2.7
+libulfius2.7-dbgsym
+libyder2.0-dbgsym
+limesuite-dbgsym
+soapysdr0.7-module-lms7-dbgsym
+
+# Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install
+librtlsdr0-dbgsym
+rtl-sdr-dbgsym
+
+# Depends on mongodb, which was droppend from debian 10 onwards
+open5gs
+open5gs-amf
+open5gs-amf-dbgsym
+open5gs-ausf
+open5gs-ausf-dbgsym
+open5gs-common
+open5gs-common-dbgsym
+open5gs-dbg
+open5gs-hss
+open5gs-hss-dbgsym
+open5gs-mme
+open5gs-mme-dbgsym
+open5gs-nrf
+open5gs-nrf-dbgsym
+open5gs-pcf
+open5gs-pcf-dbgsym
+open5gs-pcrf
+open5gs-pcrf-dbgsym
+open5gs-sgwc
+open5gs-sgwc-dbgsym
+open5gs-sgwu
+open5gs-sgwu-dbgsym
+open5gs-smf
+open5gs-smf-dbgsym
+open5gs-udm
+open5gs-udm-dbgsym
+open5gs-udr
+open5gs-udr-dbgsym
+open5gs-upf
+open5gs-upf-dbgsym
diff --git a/scripts/repo-install-test/blacklist_debian9.txt b/scripts/repo-install-test/blacklist_debian9.txt
deleted file mode 100644
index cb7db6a..0000000
--- a/scripts/repo-install-test/blacklist_debian9.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# These packages will not get explicitly installed in this test.
-# Package lines must have nothing but the package (no comment,
-# no additional space etc).
-
-# OpenBSC
-# This is legacy, we aren't really interested in testing openbsc.git
-# derived packages. Packages are found in openbsc/debian/control.
-openbsc-dev
-osmo-bsc-mgcp
-osmo-bsc-mgcp-dbg
-osmocom-bs11-utils
-osmocom-bs11-utils-dbg
-osmocom-bsc-nat
-osmocom-bsc-nat-dbg
-osmocom-bsc-sccplite
-osmocom-bsc-sccplite-dbg
-osmocom-ipaccess-utils
-osmocom-ipaccess-utils-dbg
-osmocom-nitb
-osmocom-nitb-dbg
-
-# SoapySDR is not used anymore (see OS#3542)
-soapysdr-module-lms7
-soapysdr0.6-module-lms7
-soapysdr0.6-module-lms7-dbgsym
-soapysdr0.7-module-lms7
-soapysdr0.7-module-lms7-dbgsym
diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh
index 933adef..fec344e 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -39,12 +39,12 @@ distro_obsdir() {
centos8)
echo "CentOS_8"
;;
- debian9)
- echo "Debian_9.0"
- ;;
debian10)
echo "Debian_10"
;;
+ debian11)
+ echo "Debian_11"
+ ;;
*)
echo "ERROR: unknown obsdir for '$DISTRO'." >&2
exit 1
@@ -219,9 +219,21 @@ test_conflict_debian() {
find_patterns_or_exit \
/tmp/out \
"requested an impossible situation" \
- "^The following packages have unmet dependencies:" \
- "Depends: osmocom-" \
- "but it is not going to be installed"
+ "^The following packages have unmet dependencies:"
+
+ case "$DISTRO" in
+ debian10)
+ find_patterns_or_exit \
+ /tmp/out \
+ "Depends: osmocom-" \
+ "but it is not going to be installed"
+ ;;
+ debian11)
+ find_patterns_or_exit \
+ /tmp/out \
+ "Conflicts: osmocom-"
+ ;;
+ esac
configure_osmocom_repo_debian_remove "$PROJ_CONFLICT"
configure_osmocom_repo_debian "$PROJ"