From fd987dc12f5ed391d1c83a0fe5fb39d86948ae11 Mon Sep 17 00:00:00 2001 From: rajaLucy Date: Thu, 23 Jul 2026 13:14:08 +0530 Subject: [PATCH 01/15] RDKEMW-22169:Updated version to 4.4.6 --- .github/workflows/L1-tests.yml | 4 ++-- .github/workflows/L2-tests.yml | 4 ++-- build_dependencies.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 2892500..40c0129 100755 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -11,7 +11,7 @@ on: env: BUILD_TYPE: Debug REPO_NAME: "avinput" - THUNDER_REF: "R4.4.1" + THUNDER_REF: "R4.4.6" INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}} @@ -115,7 +115,7 @@ jobs: with: repository: rdkcentral/ThunderTools path: ThunderTools - ref: R4.4.3 + ref: R4.4.6 - name: Checkout entservices-testframework uses: actions/checkout@v3 diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index bd54b9c..bac3aea 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -10,7 +10,7 @@ on: env: BUILD_TYPE: Debug - THUNDER_REF: "R4.4.1" + THUNDER_REF: "R4.4.6" INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}} @@ -83,7 +83,7 @@ jobs: with: repository: rdkcentral/ThunderTools path: ThunderTools - ref: R4.4.3 + ref: R4.4.6 - name: Checkout entservices-deviceanddisplay uses: actions/checkout@v3 diff --git a/build_dependencies.sh b/build_dependencies.sh index de8c171..ef3997b 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -35,9 +35,9 @@ pip install jsonref # Clone the required repositories -git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git +git clone --branch R4.4.6 https://github.com/rdkcentral/ThunderTools.git -git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git +git clone --branch R4.4.6 https://github.com/rdkcentral/Thunder.git git clone --branch develop https://github.com/rdkcentral/entservices-apis.git From 3c9fccab424f655408610e25fbb983234487b2ce Mon Sep 17 00:00:00 2001 From: rajaLucy Date: Fri, 24 Jul 2026 10:19:19 +0530 Subject: [PATCH 02/15] RDKEMW-22169:Updated testframework ref and patches to R4.4.6 --- .github/workflows/L1-tests.yml | 11 +++++------ .github/workflows/L2-tests.yml | 12 ++++++------ build_dependencies.sh | 11 +++++------ 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 40c0129..fe0d620 100755 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -122,7 +122,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: 1.0.14 + ref: feature/RDKEMW-22169 - name: Checkout entservices-avinput if: ${{ inputs.caller_source == 'local' }} @@ -149,7 +149,7 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | cd $GITHUB_WORKSPACE/ThunderTools - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4.6-Add-support-for-project-dir.patch cd - - name: Build ThunderTools @@ -171,10 +171,9 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | cd $GITHUB_WORKSPACE/Thunder - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.patch cd - - name: Build Thunder diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index bac3aea..30dcc45 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -111,7 +111,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: 1.0.14 + ref: feature/RDKEMW-22169 - name: Checkout googletest if: steps.cache.outputs.cache-hit != 'true' @@ -124,7 +124,7 @@ jobs: - name: Apply patches ThunderTools run: | cd $GITHUB_WORKSPACE/ThunderTools - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4.6-Add-support-for-project-dir.patch cd - - name: Build ThunderTools @@ -144,10 +144,10 @@ jobs: - name: Apply patches Thunder run: | cd $GITHUB_WORKSPACE/Thunder - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder diff --git a/build_dependencies.sh b/build_dependencies.sh index ef3997b..de3d9af 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -45,14 +45,14 @@ cd .. git clone --branch develop https://github.com/rdkcentral/entservices-helpers.git cd "$GITHUB_WORKSPACE" -git clone --branch 1.0.14 https://github.com/rdkcentral/entservices-testframework.git +git clone --branch feature/RDKEMW-22169 https://github.com/rdkcentral/entservices-testframework.git ############################ # Build Thunder-Tools echo "======================================================================================" echo "buliding thunderTools" cd ThunderTools -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4.6-Add-support-for-project-dir.patch cd - @@ -71,10 +71,9 @@ echo "========================================================================== echo "buliding thunder" cd Thunder -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.patch cd - cmake -G Ninja -S Thunder -B build/Thunder \ From 6c90f57565e3d387e1fcca7636dbbaa5f64dcffc Mon Sep 17 00:00:00 2001 From: rajaLucy Date: Fri, 24 Jul 2026 15:56:57 +0530 Subject: [PATCH 03/15] RDKEMW-22169: Add LockFixedBuffer_compat_R4.4.6 patch to L2 Thunder patches --- .github/workflows/L2-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 30dcc45..7aa2469 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -147,7 +147,7 @@ jobs: patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/LockFixedBuffer_compat_R4.4.6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder From 354161ae4a1eec4d4311b0c547c50d348db4fd5b Mon Sep 17 00:00:00 2001 From: RajaLucy <133349260+RajaLucy@users.noreply.github.com> Date: Mon, 27 Jul 2026 19:32:42 +0530 Subject: [PATCH 04/15] RDKEMW-22169:Update L2-tests.yml --- .github/workflows/L2-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 7aa2469..0e9b1af 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -146,8 +146,6 @@ jobs: cd $GITHUB_WORKSPACE/Thunder patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/LockFixedBuffer_compat_R4.4.6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder From 30671e288eaee8781e5b0120d82dd56f716117e9 Mon Sep 17 00:00:00 2001 From: RajaLucy <133349260+RajaLucy@users.noreply.github.com> Date: Mon, 27 Jul 2026 19:33:24 +0530 Subject: [PATCH 05/15] RDKEMW-22169:Update build_dependencies.sh --- build_dependencies.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build_dependencies.sh b/build_dependencies.sh index de3d9af..acc198d 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -73,7 +73,6 @@ echo "buliding thunder" cd Thunder patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.patch cd - cmake -G Ninja -S Thunder -B build/Thunder \ From b0cdd421e0815f7f41ec9c901a3aa74621a0f238 Mon Sep 17 00:00:00 2001 From: RajaLucy <133349260+RajaLucy@users.noreply.github.com> Date: Mon, 27 Jul 2026 19:34:10 +0530 Subject: [PATCH 06/15] RDKEMW-22169:Update L1-tests.yml --- .github/workflows/L1-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index fe0d620..b8123c9 100755 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -173,7 +173,6 @@ jobs: cd $GITHUB_WORKSPACE/Thunder patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.patch cd - - name: Build Thunder From e4283863be9578b62502798a3c015549349f38cb Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Wed, 5 Aug 2026 19:29:56 +0530 Subject: [PATCH 07/15] RDKEMW-22169: Updating Thunder branch and sha value --- .github/workflows/L1-tests.yml | 8 +++++--- .github/workflows/L2-tests.yml | 6 ++++-- build_dependencies.sh | 12 ++++++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) mode change 100755 => 100644 .github/workflows/L1-tests.yml mode change 100755 => 100644 .github/workflows/L2-tests.yml diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml old mode 100755 new mode 100644 index b8123c9..153b8eb --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -11,6 +11,8 @@ on: env: BUILD_TYPE: Debug REPO_NAME: "avinput" + THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4" + THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31" THUNDER_REF: "R4.4.6" INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} @@ -63,7 +65,7 @@ jobs: !install/usr/lib/pkgconfig/gtest.pc !install/usr/lib/pkgconfig/gtest_main.pc !install/usr/lib/wpeframework/plugins - key: ${{ runner.os }}-${{ env.REPO_NAME }}-${{ env.THUNDER_REF }}-${{ env.INTERFACES_REF }}-4 + key: ${{ runner.os }}-${{ env.REPO_NAME }}-${{ env.THUNDER_COMMIT_SHA }}-${{ env.INTERFACES_REF }}-4 - name: Set up Python uses: actions/setup-python@v4 @@ -107,7 +109,7 @@ jobs: with: repository: rdkcentral/Thunder path: Thunder - ref: ${{env.THUNDER_REF}} + ref: ${{env.THUNDER_COMMIT_SHA}} - name: Checkout ThunderTools if: steps.cache.outputs.cache-hit != 'true' @@ -115,7 +117,7 @@ jobs: with: repository: rdkcentral/ThunderTools path: ThunderTools - ref: R4.4.6 + ref: ${{env.THUNDER_TOOLS_COMMIT_SHA}} - name: Checkout entservices-testframework uses: actions/checkout@v3 diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml old mode 100755 new mode 100644 index 0e9b1af..ea645ce --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -10,6 +10,8 @@ on: env: BUILD_TYPE: Debug + THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4" + THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31" THUNDER_REF: "R4.4.6" INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} @@ -76,14 +78,14 @@ jobs: with: repository: rdkcentral/Thunder path: Thunder - ref: ${{env.THUNDER_REF}} + ref: ${{env.THUNDER_COMMIT_SHA}} - name: Checkout ThunderTools uses: actions/checkout@v3 with: repository: rdkcentral/ThunderTools path: ThunderTools - ref: R4.4.6 + ref: ${{env.THUNDER_TOOLS_COMMIT_SHA}} - name: Checkout entservices-deviceanddisplay uses: actions/checkout@v3 diff --git a/build_dependencies.sh b/build_dependencies.sh index 4750d57..e5ed066 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -20,6 +20,8 @@ set -x set -e ############################## +THUNDER_TOOLS_COMMIT_SHA="d5dd83c7c19c49c7f25c558c126500bd2d64f7a4" +THUNDER_COMMIT_SHA="2c0fcc5529e7da734be558ca6efa05d934dcce31" GITHUB_WORKSPACE="${PWD}" ls -la ${GITHUB_WORKSPACE} cd ${GITHUB_WORKSPACE} @@ -35,9 +37,15 @@ pip install jsonref # Clone the required repositories -git clone --branch R4.4.6 https://github.com/rdkcentral/ThunderTools.git +git clone -b R4_4-RDK https://github.com/rdkcentral/ThunderTools.git +cd ThunderTools +git checkout $THUNDER_TOOLS_COMMIT_SHA +cd .. -git clone --branch R4.4.6 https://github.com/rdkcentral/Thunder.git +git clone -b R4_4-RDK https://github.com/rdkcentral/Thunder.git +cd Thunder +git checkout $THUNDER_COMMIT_SHA +cd .. git clone --branch 4.0.8 https://github.com/rdkcentral/entservices-apis.git From bc55ad8b1b6bdafddcd3ef170b8caf73b021e8a9 Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Wed, 5 Aug 2026 19:48:37 +0530 Subject: [PATCH 08/15] RDKEMW-22169: Updating Thunder branch and sha value --- .github/workflows/L1-tests.yml | 15 --------------- .github/workflows/L2-tests.yml | 13 ------------- build_dependencies.sh | 3 --- 3 files changed, 31 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 153b8eb..807b0b0 100644 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -147,13 +147,6 @@ jobs: path: googletest ref: v1.15.0 - - name: Apply patches ThunderTools - if: steps.cache.outputs.cache-hit != 'true' - run: | - cd $GITHUB_WORKSPACE/ThunderTools - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4.6-Add-support-for-project-dir.patch - cd - - - name: Build ThunderTools if: steps.cache.outputs.cache-hit != 'true' run: > @@ -169,14 +162,6 @@ jobs: && cmake --install build/ThunderTools - - name: Apply patches Thunder - if: steps.cache.outputs.cache-hit != 'true' - run: | - cd $GITHUB_WORKSPACE/Thunder - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch - cd - - - name: Build Thunder if: steps.cache.outputs.cache-hit != 'true' run: > diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index ea645ce..99e1c43 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -123,12 +123,6 @@ jobs: path: googletest ref: v1.15.0 - - name: Apply patches ThunderTools - run: | - cd $GITHUB_WORKSPACE/ThunderTools - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4.6-Add-support-for-project-dir.patch - cd - - - name: Build ThunderTools run: > cmake @@ -143,13 +137,6 @@ jobs: && cmake --install build/ThunderTools - - name: Apply patches Thunder - run: | - cd $GITHUB_WORKSPACE/Thunder - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch - cd - - name: Build Thunder run: > cmake diff --git a/build_dependencies.sh b/build_dependencies.sh index e5ed066..0876462 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -60,7 +60,6 @@ git clone --branch feature/RDKEMW-22169 https://github.com/rdkcentral/entservice echo "======================================================================================" echo "buliding thunderTools" cd ThunderTools -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4.6-Add-support-for-project-dir.patch cd - @@ -79,8 +78,6 @@ echo "========================================================================== echo "buliding thunder" cd Thunder -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4_6.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-R4.4.6-Add-support-for-project-dir.patch cd - cmake -G Ninja -S Thunder -B build/Thunder \ From 4f7e8c5e776208bb756fed8e011d743d741c160e Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Wed, 5 Aug 2026 21:11:09 +0530 Subject: [PATCH 09/15] RDKEMW-22169: Fix WorkFlow Failures --- .github/workflows/L1-tests.yml | 3 --- .github/workflows/L2-tests.yml | 4 ---- plugin/CMakeLists.txt | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 807b0b0..e60a1a1 100644 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -354,7 +354,6 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -412,7 +411,6 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -483,7 +481,6 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 99e1c43..dc0eb70 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -305,7 +305,6 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -394,7 +393,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -fprofile-arcs -ftest-coverage - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -473,7 +471,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -fprofile-arcs -ftest-coverage - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -553,7 +550,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -fprofile-arcs -ftest-coverage - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index 52adb50..aaf14a6 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -87,4 +87,4 @@ target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plu install(TARGETS ${PLUGIN_IMPLEMENTATION} DESTINATION lib/${STORAGE_DIRECTORY}/plugins) install(TARGETS ${MODULE_NAME} DESTINATION lib/${STORAGE_DIRECTORY}/plugins) -write_config(${PLUGIN_NAME}) +write_config(PLUGINS ${PLUGIN_NAME}) From 98c075de8359894475b8f508cbe431f64c760f57 Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Wed, 5 Aug 2026 23:59:45 +0530 Subject: [PATCH 10/15] RDKEMW-22169:Update L1-tests.yml --- .github/workflows/L1-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index e60a1a1..807b0b0 100644 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -354,6 +354,7 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON + -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -411,6 +412,7 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON + -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -481,6 +483,7 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON + -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 From 101581736bea1d35c8ee7c12e4cf14ce09ef58ad Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Fri, 7 Aug 2026 18:13:05 +0530 Subject: [PATCH 11/15] RDKEMW-22169: Fixing L2 WorkFlow Failure --- .github/workflows/L1-tests.yml | 2 +- .github/workflows/L2-tests.yml | 3 ++- build_dependencies.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 807b0b0..aaee2a4 100644 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -124,7 +124,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: feature/RDKEMW-22169 + ref: develop - name: Checkout entservices-avinput if: ${{ inputs.caller_source == 'local' }} diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index dc0eb70..2061524 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -113,7 +113,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: feature/RDKEMW-22169 + ref: develop - name: Checkout googletest if: steps.cache.outputs.cache-hit != 'true' @@ -129,6 +129,7 @@ jobs: -S "$GITHUB_WORKSPACE/ThunderTools" -B build/ThunderTools -DEXCEPTIONS_ENABLE=ON + -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" diff --git a/build_dependencies.sh b/build_dependencies.sh index 0876462..e397bea 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -53,7 +53,7 @@ cd .. git clone --branch develop https://github.com/rdkcentral/entservices-helpers.git cd "$GITHUB_WORKSPACE" -git clone --branch feature/RDKEMW-22169 https://github.com/rdkcentral/entservices-testframework.git +git clone --branch develop https://github.com/rdkcentral/entservices-testframework.git ############################ # Build Thunder-Tools From 0219a72284c05fd306493d44070d2235e625feef Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Fri, 7 Aug 2026 18:28:20 +0530 Subject: [PATCH 12/15] RDKEMW-22169: Fixing L2 WorkFlow Failure --- .github/workflows/L2-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 2061524..9b60455 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -129,7 +129,6 @@ jobs: -S "$GITHUB_WORKSPACE/ThunderTools" -B build/ThunderTools -DEXCEPTIONS_ENABLE=ON - -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" @@ -156,6 +155,7 @@ jobs: && cmake --install build/Thunder + -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" - name: Checkout entservices-apis uses: actions/checkout@v3 with: From beafe205691853f85a671f74618a817fcaab76ce Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Fri, 7 Aug 2026 18:30:29 +0530 Subject: [PATCH 13/15] RDKEMW-22169: Fixing L2 WorkFlow Failure --- .github/workflows/L2-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 9b60455..2061524 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -129,6 +129,7 @@ jobs: -S "$GITHUB_WORKSPACE/ThunderTools" -B build/ThunderTools -DEXCEPTIONS_ENABLE=ON + -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" @@ -155,7 +156,6 @@ jobs: && cmake --install build/Thunder - -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" - name: Checkout entservices-apis uses: actions/checkout@v3 with: From 7ad54dd39a4487303ae88f2846f3521523208759 Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Fri, 7 Aug 2026 18:43:18 +0530 Subject: [PATCH 14/15] RDKEMW-22169: Fixing L2 WorkFlow Failure --- .github/workflows/L2-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 2061524..c248227 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -131,7 +131,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" - -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" && cmake --build build/ThunderTools -j8 @@ -151,6 +150,7 @@ jobs: -DBINDING=127.0.0.1 -DPORT=9998 -DEXCEPTIONS_ENABLE=ON + -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" && cmake --build build/Thunder -j8 && From 5f1df6f670c9f891f673bfc717286074b0b4c5ca Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Fri, 7 Aug 2026 18:49:49 +0530 Subject: [PATCH 15/15] RDKEMW:22169:Update L2-tests.yml --- .github/workflows/L2-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index c248227..dceb9f6 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -129,8 +129,8 @@ jobs: -S "$GITHUB_WORKSPACE/ThunderTools" -B build/ThunderTools -DEXCEPTIONS_ENABLE=ON - -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" + -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" && cmake --build build/ThunderTools -j8 @@ -150,7 +150,7 @@ jobs: -DBINDING=127.0.0.1 -DPORT=9998 -DEXCEPTIONS_ENABLE=ON - -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" + -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" && cmake --build build/Thunder -j8 &&