osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40720?usp=email ) Change subject: testenv/requirements: simplify rsync checks ...................................................................... testenv/requirements: simplify rsync checks rsync is needed by osmo-dev for the autoreconf-in-src-copy feature that testenv uses. * Don't require rsync when running in podman. This is not necessary anymore since 92b3784 ("testenv: remove copy_ttcn3_hacks_dir"). * Combine the "if not testenv.args.binary_repo" code path with the "if not testenv.args.podman" code path, as --binary_repo can't be set without --podman. Change-Id: I4fd885aa6c9b6801e18043f783bae357da716d19 --- M _testenv/testenv/requirements.py 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/40720/1 diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 54d07fe..97fae0c 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -18,7 +18,6 @@ programs += [ "buildah", "podman", - "rsync", ] else: programs += [ @@ -31,6 +30,7 @@ "gcc", "make", "pkg-config", + "rsync", "setcap", "ttcn3_compiler", "wget", @@ -44,10 +44,6 @@ "lddtree", "qemu-system-x86_64", ] - if not testenv.args.binary_repo: - programs += [ - "rsync", - ] abort = False for program in programs: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fd885aa6c9b6801e18043f783bae357da716d19 Gerrit-Change-Number: 40720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de>