From cb862560f21f6cd376a4b3f9fb74615f410f3f29 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 4 May 2021 13:56:25 -0400 Subject: Update versions for Aluminum SR3 Update versions for Aluminum SR3. Updated CSIT scripts to add workaround for issue with karaf client not exiting. Client exits on end of file (^d), so need it to see end of file in input by using it in a pipeline, with empty string as stdin. Issue-ID: CCSDK-3285 Signed-off-by: Dan Timoney Change-Id: Ic40c2cd138f8f4888aa83dc75ccc1a818d4605b3 --- csit/plans/healthcheck/setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'csit') diff --git a/csit/plans/healthcheck/setup.sh b/csit/plans/healthcheck/setup.sh index 327aba21..dddecbf0 100644 --- a/csit/plans/healthcheck/setup.sh +++ b/csit/plans/healthcheck/setup.sh @@ -77,12 +77,12 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then exit 1; fi -num_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d' ' -f1) +num_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1) if [ "$num_bundles" -ge 333 ]; then - num_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d' ' -f1) - num_failed_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l) - failed_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | grep Failure) + num_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1) + num_failed_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep Failure | wc -l) + failed_bundles=$(docker exec -i ccsdk_odlsli_container sh -c "echo '' |/opt/opendaylight/current/bin/client bundle:list" | grep Failure) echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles. fi -- cgit 1.2.3-korg