osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41977?usp=email ) Change subject: repo-install-test: debian 10: osmo-gbproxy only ...................................................................... repo-install-test: debian 10: osmo-gbproxy only The debian 10 repository has been officially disabled: https://osmocom.org/news/308 However we just re-enabled a subset of the packages, osmo-gbproxy + dependencies, because currently they are relevant for a customer. Adjust the repo-install-test to deal with this subset of packages for debian 10 to fix that it is currently failing. I have verified that repo-install-test works with this change for debian 10, 11 and 12. It currently doesn't run for debian 13 yet (OS#6934). Related: SYS#7859 Change-Id: Id8d8cda8e399719f06aeb1843eb8f5ab12a90e8f --- M scripts/repo-install-test/run-inside.sh 1 file changed, 37 insertions(+), 38 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index 2d75e6a..db93b86 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -14,7 +14,7 @@ # * osmo-remsim-client (exits immediately without USB device) # * osmo-trap2cgi (missing config: /etc/osmocom/%N.ini, OS#4108) # * osmo-trx-* (exits immediately without trx device) -# * osmo-upf (not available for debian 10, gets added in services_check()) +# * osmo-upf nightly needs a newer kernel (OS#5905) SERVICES=" osmo-bsc osmo-bts-virtual @@ -186,9 +186,7 @@ case "$DISTRO" in debian10) # libgnutls30: can't access https://osmocom.org otherwise - # ca-certificates-java: fails if installed after java apt-get install -y --no-install-recommends \ - ca-certificates-java \ libgnutls30 ;; esac @@ -237,6 +235,15 @@ } test_conflict_debian() { + # SYS#7859: the debian10 repository only has osmo-gbproxy + depends, so + # the conflict test doesn't work here, skip it + if [ "$DISTRO" = "debian10" ]; then + set +x + echo "Test skipped for debian10" + set -x + return + fi + apt-get -y install libosmocore configure_osmocom_repo_debian_remove "$PROJ" @@ -254,19 +261,9 @@ "requested an impossible situation" \ "^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|debian12) - find_patterns_or_exit \ - /tmp/out \ - "Conflicts: osmocom-" - ;; - esac + find_patterns_or_exit \ + /tmp/out \ + "Conflicts: osmocom-" configure_osmocom_repo_debian_remove "$PROJ_CONFLICT" configure_osmocom_repo_debian "$PROJ" @@ -417,8 +414,15 @@ fi } +# Make sure that binares run at all and output a proper version test_binaries() { - # Make sure that binares run at all and output a proper version + # SYS#7859 + if [ "$DISTRO" = "debian10" ]; then + test_binaries_version \ + osmo-gbproxy + return + fi + test_binaries_version \ osmo-bsc \ osmo-bts-trx \ @@ -438,6 +442,7 @@ osmo-pcap-client \ osmo-pcap-server \ osmo-pcu \ + osmo-pfcp-tool \ osmo-remsim-bankd \ osmo-remsim-client-shell \ osmo-remsim-client-st2 \ @@ -448,7 +453,8 @@ osmo-stp \ osmo-trx-ipc \ osmo-trx-uhd \ - osmo-uecups-daemon + osmo-uecups-daemon \ + osmo-upf case "$DISTRO" in debian*) @@ -457,12 +463,6 @@ ;; esac - if [ "$DISTRO" != "debian10" ]; then - test_binaries_version \ - osmo-pfcp-tool \ - osmo-upf - fi - if [ "$FEED" = "nightly" ]; then test_binaries_version \ osmo-bsc-nat @@ -471,22 +471,21 @@ services_check() { local service - local services_feed="$SERVICES" + local services_feed local failed="" - if [ "$FEED" = "nightly" ]; then - services_feed="$services_feed $SERVICES_NIGHTLY" - fi - - # We don't build osmo-upf for debian 10 - if [ "$DISTRO" != "debian10" ]; then - # osmo-upf <= 0.1.1 needs GTP kernel module - if [ "$FEED" = "nightly" ]; then - # osmo-upf nightly needs a newer kernel (OS#5905) - # services_feed="$services_feed osmo-upf" - true - fi - fi + case "$DISTRO" in + "debian10") + # SYS#7859 + services_feed="osmo-gbproxy" + ;; + *) + services_feed="$SERVICES" + if [ "$FEED" = "nightly" ]; then + services_feed="$services_feed $SERVICES_NIGHTLY" + fi + ;; + esac systemctl start $services_feed sleep 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41977?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id8d8cda8e399719f06aeb1843eb8f5ab12a90e8f Gerrit-Change-Number: 41977 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>