osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/42280?usp=email ) Change subject: repo-install-test: fix test_conflict for debian 13 ...................................................................... repo-install-test: fix test_conflict for debian 13 Two changes are necessary to make this test work with debian 13: * Installing libosmocore from osmocom-latest, then switching to osmocom-nightly and attempting to install another package is not enough anymore to trigger a conflict. apt is now able to resolve this by uninstalling the osmocom-latest package and upgrading libosmocore to the nightly version. Force the conflict by explicitly marking osmocom-latest (osmocom-$FEED) as installed and for hold. * The apt conflict message has been reworked, so the string to look for needs to be adjusted. Change-Id: Ibdcd583e48b97ced11ad4939974dccea3e139480 --- M scripts/repo-install-test/run-inside.sh 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/80/42280/1 diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index 6937dac..836d59d 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -242,7 +242,8 @@ return fi - apt-get -y install libosmocore + apt-get -y install libosmocore osmocom-"$FEED" + apt-mark hold osmocom-"$FEED" configure_osmocom_repo_debian_remove "$PROJ" configure_osmocom_repo_debian "$PROJ_CONFLICT" @@ -259,9 +260,18 @@ "requested an impossible situation" \ "^The following packages have unmet dependencies:" - find_patterns_or_exit \ - /tmp/out \ - "Conflicts: osmocom-" + case "$DISTRO" in + debian11|debian12) + find_patterns_or_exit \ + /tmp/out \ + "Conflicts: osmocom-" + ;; + *) + find_patterns_or_exit \ + /tmp/out \ + "Conflicts osmocom-" + ;; + esac configure_osmocom_repo_debian_remove "$PROJ_CONFLICT" configure_osmocom_repo_debian "$PROJ" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibdcd583e48b97ced11ad4939974dccea3e139480 Gerrit-Change-Number: 42280 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de>