Add network test executor to Gitlab FV job (#1027)

Add nw test report to reporting job.
Update some variables in script.

Relates-To: OLPEDGE-2243

Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>

Author: ystefinko

.gitlab-ci.yml

@@ -58,6 +58,7 @@ build_test_linux_fv:
   script:
   - $CI_PROJECT_DIR/scripts/linux/fv/gitlab_build_fv.sh
   - $CI_PROJECT_DIR/scripts/linux/fv/gitlab_test_fv.sh
+  - $CI_PROJECT_DIR/scripts/linux/fv/gitlab-olp-cpp-sdk-functional-network-test.sh
   only:
     refs:
       - branches
@@ -146,13 +147,16 @@ translate_report_fv:
     - python -m junit2htmlreport --report-matrix reports/unit-index.html reports/olp-dataservice-write-test-report.xml reports/olp-dataservice-read-test-report.xml reports/olp-core-test-report.xml reports/olp-authentication-test-report.xml
     - python -m junit2htmlreport --report-matrix reports/integration-index.html reports/olp-integration*.xml
     - python -m junit2htmlreport --report-matrix reports/index.html reports/*.xml
+    - python -m junit2htmlreport --report-matrix reports/fun-network-index.html reports/olp-functional-network-test-report.xml
+    - sed -i -e 's/Reports\ Matrix/Functional\ Network\ Test\ Report/g' reports/fun-network-index.html
     - sed -i -e 's/Reports\ Matrix/Unit\ Test\ Report/g' reports/unit-index.html
     - sed -i -e 's/Reports\ Matrix/Integration\ Test\ Report/g' reports/integration-index.html
     - sed -i -e 's/Reports\ Matrix/Functional\ Test\ Report/g' reports/functional-index.html
     - sed -i -e 's/Reports\ Matrix/Full\ Test\ Report/g' reports/index.html
     - cat reports/unit-index.html >> reports/index.html
     - cat reports/integration-index.html >> reports/index.html
     - cat reports/functional-index.html >> reports/index.html
+    - cat reports/fun-network-index.html >> reports/index.html
     - mkdir -p .public
     - cp reports/*ndex.html .public/
   artifacts:

scripts/linux/fv/gitlab-olp-cpp-sdk-functional-network-test.sh

@@ -20,6 +20,11 @@
 # For core dump backtrace
 ulimit -c unlimited
 
+# Set workspace location
+if [[ ${CI_PROJECT_DIR} == "" ]]; then
+    export CI_PROJECT_DIR=`pwd`
+fi
+
 echo ">>> Starting Mock Server... >>>"
 pushd tests/utils/mock-server
 npm install
@@ -46,11 +51,14 @@ echo "mock-server-cert.pem" >> /etc/ca-certificates.conf
 update-ca-certificates
 
 echo ">>> Start network tests ... >>>"
-$REPO_HOME/build/tests/functional/network/olp-cpp-sdk-functional-network-tests  \
-    --gtest_output="xml:$REPO_HOME/reports/olp-functional-network-test-report.xml"
+$CI_PROJECT_DIR/build/tests/functional/network/olp-cpp-sdk-functional-network-tests  \
+    --gtest_output="xml:$CI_PROJECT_DIR/reports/olp-functional-network-test-report.xml"
+result=$?
 echo ">>> Finished network tests >>>"
 
 # Terminate the mock server
 kill -TERM $SERVER_PID
 
 wait
+
+exit ${result}