Add Unit test running on GitActions

.github/workflows/cve-scanning.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        folder-name: ["aws-linux", "el7", "el8", "ubuntu-focal-deb", "ubuntu-focal" ]
+        folder-name: ["aws-linux", "el8", "ubuntu-focal-deb", "ubuntu-focal" ]
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-buildx-action@v3

.github/workflows/pr-unit-test.yml

@@ -0,0 +1,102 @@
+name: PR Unit Test
+
+on: [pull_request]
+
+# make GHA actions use node16 which still works with aws-linux
+# See https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+# Unclear how long this will work though
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
+permissions:
+  contents: read
+  packages: read
+  actions: read
+  checks: write
+  statuses: write
+
+jobs:
+  pr-check:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: aws-linux
+            image: latest
+            build:
+              type: Release
+          - os: el8
+            image: latest
+            build:
+              type: Release
+          - os: ubuntu-focal-deb
+            image: latest
+            build:
+              type: Release
+          - os: ubuntu-focal
+            image: latest
+            build:
+              type: Release
+          - os: el8
+            image: latest
+            build:
+              type: LCheck
+          - os: el8
+            image: latest
+            build:
+              type: TCheck
+          - os: el8
+            image: latest
+            build:
+              type: DCheck
+          - os: el8
+            image: latest
+            build:
+              type: LCov
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}-${{ matrix.os }}-${{ matrix.build.type }}
+      cancel-in-progress: true
+    container:
+      image: ghcr.io/finos/symphonymediabridge/buildsmb-${{ matrix.os }}:${{ matrix.image }}
+    name: pr-check-${{ matrix.os }}-${{ matrix.build.type }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Mark workspace as safe
+        run: git config --global --add safe.directory $GITHUB_WORKSPACE
+      - name: Build
+        run: docker/${{ matrix.os }}/buildscript.sh ${{ matrix.build.type }}
+      - name: Run Tests
+        run: docker/${{ matrix.os }}/runtests.sh
+      - name: DEBUG search unit tests logs
+        run: find . -type f -iname "smb_unit_test*"
+      - name: Upload Unit test logs
+        uses: actions/upload-artifact@v3
+        if: always()  # This step runs regardless of the previous step results
+        with:
+          name: unit-test-logs-${{ matrix.os }}-${{ matrix.build.type }}
+          retention-days: 14
+          path: tools/testfiles/smb_unit_test*.log
+      - name: Upload test results
+        uses: actions/upload-artifact@v3
+        if: always()  # This step runs regardless of the previous step results
+        with:
+          name: test-results-${{ matrix.os }}-${{ matrix.build.type }}
+          retention-days: 14
+          path: ${{ matrix.os }}/smb/test-results*.xml
+      - name: Upload Code Coverage
+        uses: actions/upload-artifact@v3
+        if: matrix.build.type =='LCov' && success()  # This step runs regardless of the previous step results
+        with:
+          name: code-coverage-${{ matrix.os }}-${{ matrix.build.type }}
+          retention-days: 14
+          path: ${{ matrix.os }}/smb/coverage/
+      - name: Annotate test results
+        uses: mikepenz/action-junit-report@v3
+        if: success() || failure()        # run this step even if previous step failed
+        with:
+          check_name: JUnit Test Report ${{ matrix.os }} ${{ matrix.build.type }}
+          report_paths: ${{ matrix.os }}/smb/test-results*.xml
+          job_name: pr-check-${{ matrix.os }}-${{ matrix.build.type }}
+          detailed_summary: true
+          update_check: true

Jenkins/Jenkinsfile

@@ -38,18 +38,6 @@ node('be-integration') {
 
         sh "gcloud auth configure-docker europe-west1-docker.pkg.dev --quiet"
 
-        docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-el7:latest').inside {
-            stage('Build Centos 7') {
-                env.GIT_COMMITTER_NAME = "Jenkins deployment job"
-                env.GIT_COMMITTER_EMAIL = "[email protected]"
-                sh "docker/el7/buildscript.sh Release"
-            }
-
-            stage('Run tests centos7') {
-                sh "docker/el7/runtests.sh"
-            }
-        }
-
         docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-el8:latest').inside {
             stage('Build RHEL 8') {
                 env.GIT_COMMITTER_NAME = "Jenkins deployment job"
@@ -98,9 +86,9 @@ node('be-integration') {
             }
         }
 
-        docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-el7:latest').inside {
+        docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-ubuntu-focal-deb:latest').inside {
             stage('Create archive') {
-                sh "zip -r ${baseName}-${version}.zip el7/smb/smb el7/smb/versioninfo.txt el7/smb/libs/ el8/smb/smb el8/smb/versioninfo.txt el8/smb/libs/ ubuntu-jammy/smb/smb ubuntu-jammy/smb/versioninfo.txt ubuntu-jammy/smb/libs/ ubuntu-focal-deb/smb/*.tar.gz ubuntu-focal-deb/smb/*.deb aws-linux/smb/versioninfo.txt aws-linux/smb/libs/ aws-linux/smb/smb"
+                sh "zip -r ${baseName}-${version}.zip el8/smb/smb el8/smb/versioninfo.txt el8/smb/libs/ ubuntu-jammy/smb/smb ubuntu-jammy/smb/versioninfo.txt ubuntu-jammy/smb/libs/ ubuntu-focal-deb/smb/*.tar.gz ubuntu-focal-deb/smb/*.deb aws-linux/smb/versioninfo.txt aws-linux/smb/libs/ aws-linux/smb/smb"
             }
         }
 

Jenkins/PRUnitTestRunner.groovy

@@ -30,11 +30,8 @@ void prRunner(String cmakeBuildType, String platform, String dockerTag) {
 }
 
 abortPreviousRunningBuilds()
-parallel "Release el7": {
-    node('be-integration') {
-        prRunner("Release", "el7", "latest")
-    }
-}, "Release AWS-linux": {
+
+parallel "Release AWS-linux": {
     node('be-integration') {
         prRunner("Release", "aws-linux", "latest")
     }

docker/prepdocker.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "$#" -ne 1 ]; then
-    echo "Usage prepdocker.sh <el7|el8|ubuntu-focal|ubuntu-jammy|aws-linux>. Eg. prepdocker.sh el8"
+    echo "Usage prepdocker.sh <el8|ubuntu-focal|ubuntu-jammy|aws-linux>. Eg. prepdocker.sh el8"
     exit
 fi
 

test/gtest_main.cpp

@@ -12,7 +12,7 @@ class GtestMain : public ::testing::Environment
         utils::Time::initialize();
         auto fh = fopen("./smb_unit_test.log", "w");
         fclose(fh);
-        logger::setup("./smb_unit_test.log", true, true, logger::Level::DBG, 8 * 1024 * 1024);
+        logger::setup("./smb_unit_test.log", false, false, logger::Level::DBG, 8 * 1024 * 1024);
     }
 
     void TearDown() override { logger::stop(); }

test/gtest_main2.cpp

@@ -12,7 +12,7 @@ class GtestMain : public ::testing::Environment
         utils::Time::initialize();
         auto fh = fopen("./smb_unit_test2.log", "w");
         fclose(fh);
-        logger::setup("./smb_unit_test2.log", true, true, logger::Level::DBG, 8 * 1024 * 1024);
+        logger::setup("./smb_unit_test2.log", false, false, logger::Level::DBG, 8 * 1024 * 1024);
     }
 
     void TearDown() override { logger::stop(); }

test/integration/IntegrationCallTypes.cpp

@@ -69,7 +69,7 @@ TEST_P(IntegrationCallTypesTest, party3AllModes)
     auto transportMode = std::get<0>(GetParam());
     auto encryptionMode = std::get<1>(GetParam());
 
-    logger::info("test transportmode %u, encryption %u", "party3AllModes", transportMode, encryptionMode);
+    logger::info("test transportmode %d, encryption %d", "party3AllModes", static_cast<int>(transportMode), static_cast<int>(encryptionMode));
     auto testBody = [this, transportMode, encryptionMode]() {
         _config.readFromString(_defaultSmbConfig);
         _config.enableSrtpNullCipher = true;

test/transport/IceTest.cpp

@@ -1507,7 +1507,7 @@ TEST_F(IceRobustness, earlyProbes)
 
     for (auto& session : sessions)
     {
-        logger::info("session state %d", "", session->getState());
+        logger::info("session state %d", "", static_cast<int>(session->getState()));
         log(session->getLocalCandidates());
         log(session->getRemoteCandidates());