Preparations for Clixon 6.0 release

Test:
- netconf-monitoring using http-data disabled for restconf=fcgi
- updated cicd.sh script with detail and change logfile

test/cicd/Makefile.in

@@ -58,9 +58,9 @@ all: $(HOSTS)
 # Real hosts reachable by ssh
 $(HOSTS): 
 ifdef LOGDIR
-	./cicd.sh $@ $(RESTCONF) 2>&1 > $(LOGDIR)/$@-$(RESTCONF).log
+	./cicd.sh $@ $(RESTCONF) 2>&1 > $(LOGDIR)/host-$(RESTCONF)-$@.log
 else
-	./cicd.sh $@ $(RESTCONF) 2>&1 | tee /$@-$(RESTCONF).log
+	./cicd.sh $@ $(RESTCONF) 2>&1 | tee /host-$(RESTCONF)-$@.log
 endif
 
 clean:

test/cicd/cicd.sh

@@ -54,5 +54,5 @@ if [ "$restconf" = "fcgi" ]; then
 else
     ssh -t $h sudo systemctl stop nginx
 fi
-ssh -t $h "(cd src/clixon/test; ./sum.sh)"
+ssh -t $h "(cd src/clixon/test; detail=true ./sum.sh)"
 exit 0

test/test_netconf_monitoring_location.sh

@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
 # Test for RFC6022 YANG Module for NETCONF Monitoring
-# Tests the location scheme by using the clixon http-data feature
+# Tests the location scheme by using the clixon http-data feature (only restconf=native)
 
 # Magic line must be first in script (see README.md)
 s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 
 APPNAME=example
 
+# Does not work with fcgi
+if [ "${WITH_RESTCONF}" = "fcgi" ]; then
+    echo "...skipped: Must run with --with-restconf=native"
+    rm -rf $dir
+    if [ "$s" = $0 ]; then exit 0; else return 0; fi
+fi
+
 cfg=$dir/conf_yang.xml
 fyang=$dir/clixon-example@2022-01-01.yang