From 7b376e03798fd2dee269f9d0c7534f7cb183e266 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Tue, 11 Jul 2023 17:15:37 +0530 Subject: [PATCH] Align test paths --- gitlab-ci/install-dependencies.sh | 10 +++++----- gitlab-ci/iopsys-supervisord.conf | 4 ++-- gitlab-ci/shared.sh | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh index ac33c8e4..9ab5a47f 100755 --- a/gitlab-ci/install-dependencies.sh +++ b/gitlab-ci/install-dependencies.sh @@ -20,8 +20,8 @@ install_libwifi_dataelements ${1} # Install datamodel plugins only when pipeline trigger for bbfdm if [ -z "${1}" ]; then - git clone -b service_registration --depth 1 https://dev.iopsys.eu/feed/iopsys.git /opt/dev/iopsys - git clone -b devel --depth 1 https://dev.iopsys.eu/bbf/bulkdata.git /opt/dev/bulkdata + git clone --depth 1 https://dev.iopsys.eu/feed/iopsys.git /opt/dev/iopsys + git clone --depth 1 https://dev.iopsys.eu/bbf/bulkdata.git /opt/dev/bulkdata cp -f /opt/dev/iopsys/urlfilter/files/etc/bbfdm/json/urlfilter.json /etc/bbfdm/json cp -f /opt/dev/iopsys/obuspa/files/etc/bbfdm/json/USPAgent.json /etc/bbfdm/json @@ -29,9 +29,9 @@ if [ -z "${1}" ]; then cp -f /opt/dev/iopsys/icwmp/files/etc/bbfdm/json/CWMPManagementServer.json /etc/bbfdm/json cp -f /opt/dev/iopsys/ponmngr/files/etc/bbfdm/json/xpon.json /etc/bbfdm/json - mkdir -p /etc/bbfdm/services/bulkdata - cp -f /opt/dev/bulkdata/bbf_plugin/bulkdata.json /etc/bbfdm/services/bulkdata - cp -f /opt/dev/iopsys/bulkdata/files/etc/bbfdm/services/bulkdata/input.json /etc/bbfdm/services/bulkdata + mkdir -p /etc/bulkdata + cp -f /opt/dev/bulkdata/bbf_plugin/bulkdata.json /etc/bulkdata + cp -f /opt/dev/iopsys/bulkdata/files/etc/bulkdata/input.json /etc/bulkdata # install usermngr plugin install_libusermngr diff --git a/gitlab-ci/iopsys-supervisord.conf b/gitlab-ci/iopsys-supervisord.conf index fc7573a6..7082399e 100755 --- a/gitlab-ci/iopsys-supervisord.conf +++ b/gitlab-ci/iopsys-supervisord.conf @@ -31,11 +31,11 @@ autorestart=false numprocs_start=4 startretries=0 priority=5 -command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-report-bulkdata.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/bbfdmd -m /etc/bbfdm/services/bulkdata/input.json" +command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-report-bulkdata.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/bbfdmd -m /etc/bulkdata/input.json" [program:bbfdm_periodicstatsd] autorestart=false numprocs_start=5 startretries=0 priority=6 -command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-report-periodicstats.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/bbfdmd -m /etc/bbfdm/services/periodicstats/input.json" +command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-report-periodicstats.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/bbfdmd -m /etc/periodicstats/input.json" diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh index f07df97d..eab5fdc0 100755 --- a/gitlab-ci/shared.sh +++ b/gitlab-ci/shared.sh @@ -117,9 +117,9 @@ function install_libperiodicstats() exec_cmd_verbose make -C /opt/dev/periodicstats/ echo "installing libperiodicstats" - mkdir -p /etc/bbfdm/services/periodicstats - cp -f /opt/dev/periodicstats/bbf_plugin/libperiodicstats.so /etc/bbfdm/services/periodicstats - cp -f /opt/dev/iopsys/periodicstats/files/etc/bbfdm/services/periodicstats/input.json /etc/bbfdm/services/periodicstats + mkdir -p /etc/periodicstats + cp -f /opt/dev/periodicstats/bbf_plugin/libperiodicstats.so /etc/periodicstats/ + cp -f /opt/dev/iopsys/periodicstats/files/etc/periodicstats/input.json /etc/periodicstats } function install_libcwmpdm()