summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Bollo <jose.bollo@iot.bzh>2019-11-06 16:06:47 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-11-07 13:39:26 +0000
commit13329bab4eb245aef71ebfc33caadca7ad101cac (patch)
tree460a461f6ade5e7f8428f1def803ca6bc118c524
parent2f2798ff66a627a69749d43bbfe4a4915fce215b (diff)
Cynagora: Replace cynara with cynagoraicefish_8.99.1icefish/8.99.18.99.1
Currently we disable ptests/socket tests to be enabled in SPEC-2940 and SPEC-2941. Shift from the permission database cynara to cynagora permission database with a compatibility library. Bug-AGL: SPEC-2844 Bug-AGL: SPEC-2941 Signed-off-by: Jose Bollo <jose.bollo@iot.bzh> Change-Id: I673e47ae237a83926f15d003dd2d2623a08eefb5
-rwxr-xr-xcommon/scripts/ptest-lava-wrapper.sh2
-rwxr-xr-xcommon/scripts/service-check-gfx.sh4
-rwxr-xr-xcommon/scripts/service-check-nogfx.sh4
3 files changed, 5 insertions, 5 deletions
diff --git a/common/scripts/ptest-lava-wrapper.sh b/common/scripts/ptest-lava-wrapper.sh
index 2c21b73..8887d29 100755
--- a/common/scripts/ptest-lava-wrapper.sh
+++ b/common/scripts/ptest-lava-wrapper.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-REQUIREDPTESTS="acl attr cynara xmlsec1 libxml2 lua"
+REQUIREDPTESTS="acl attr xmlsec1 libxml2 lua"
# NOT: systemd openssl openssh
# Check if ptest packages are installed
diff --git a/common/scripts/service-check-gfx.sh b/common/scripts/service-check-gfx.sh
index 9064dbd..825ed7a 100755
--- a/common/scripts/service-check-gfx.sh
+++ b/common/scripts/service-check-gfx.sh
@@ -18,7 +18,7 @@ while getopts ":b:d:" option; do
esac
done
-REQUIREDSOCKETS="cynara.socket dbus.socket security-manager.socket"
+REQUIREDSOCKETS="dbus.socket security-manager.socket"
REQUIREDSERVICES="afm-system-daemon.service connman.service ofono.service weston.service bluetooth.service"
ALL="${REQUIREDSOCKETS} ${REQUIREDSERVICES}"
@@ -60,4 +60,4 @@ echo "Only the failed systemd units:"
echo "------------------------------------------------"
( systemctl list-units | grep failed ) || true
-exit 0 \ No newline at end of file
+exit 0
diff --git a/common/scripts/service-check-nogfx.sh b/common/scripts/service-check-nogfx.sh
index 16ecbee..6515377 100755
--- a/common/scripts/service-check-nogfx.sh
+++ b/common/scripts/service-check-nogfx.sh
@@ -3,7 +3,7 @@
export LANG=C
export TERM=dumb
-REQUIREDSOCKETS="cynara.socket dbus.socket security-manager.socket"
+REQUIREDSOCKETS="dbus.socket security-manager.socket"
REQUIREDSERVICES="afm-system-daemon.service connman.service ofono.service bluetooth.service"
ALL="${REQUIREDSOCKETS} ${REQUIREDSERVICES}"
@@ -40,4 +40,4 @@ echo "------------------------------------------------"
( systemctl list-units | grep failed ) || true
-exit 0 \ No newline at end of file
+exit 0