From 687a2d77daa9f25654b67d9a93ff4eb8fe11a095 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Sat, 15 Apr 2023 21:04:11 +0530
Subject: [PATCH] Update absolute path
---
.gitignore | 1 +
.gitlab-ci.yml | 2 +-
gitlab-ci/functional-test.sh | 5 +++--
gitlab-ci/iopsys-supervisord.conf | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 12c9bc8..04f6aa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
*.log
*.xml
docs/index.md
+timestamp
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d5b453..0e2ce26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,5 +29,5 @@ run_functional_test:
when: always
paths:
- test-coverage.xml
- - memory-report.xml
+ - /tmp/memory-report.xml
- timestamp
diff --git a/gitlab-ci/functional-test.sh b/gitlab-ci/functional-test.sh
index c8e6202..1e7f4ef 100755
--- a/gitlab-ci/functional-test.sh
+++ b/gitlab-ci/functional-test.sh
@@ -21,13 +21,14 @@ function check_result()
# building twamp
twamp_clean
twamp_make
+ln -s ${PWD}/twampd /usr/sbin/twampd
echo "Running functional Tests"
supervisorctl update
supervisorctl restart all
+sleep 5
supervisorctl status all
-ubus wait_for usp.raw usp
-supervisorctl status all
+ubus wait_for bbfdm
echo "TWAMP light Test"
result=`python3 /opt/dev/twampy/twampy.py sender -c 1 127.0.0.1:862`
diff --git a/gitlab-ci/iopsys-supervisord.conf b/gitlab-ci/iopsys-supervisord.conf
index a1e51be..5d2427b 100644
--- a/gitlab-ci/iopsys-supervisord.conf
+++ b/gitlab-ci/iopsys-supervisord.conf
@@ -16,5 +16,5 @@ command=/bin/bash -c "/usr/sbin/bbfdmd"
[program:twampd]
autorestart=false
priority=4
-command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/builds/bbf/twamp-light/memory-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=definite,reachable --errors-for-leak-kinds=definite,reachable --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /builds/bbf/twamp-light/twampd"
+command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=definite,reachable --errors-for-leak-kinds=definite,reachable --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/twampd"
--
GitLab