From af451acb1b987d46324bf1e9910dad49e8f08eb6 Mon Sep 17 00:00:00 2001 From: rajaLucy Date: Thu, 23 Jul 2026 15:30:24 +0530 Subject: [PATCH 01/16] RDKEMW-22169:Updated version to 4.4.6 --- .github/workflows/L1-tests.yml | 4 ++-- .github/workflows/L2-tests-oop.yml | 4 ++-- .github/workflows/L2-tests.yml | 4 ++-- build_dependencies.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 84fd658..0155333 100755 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -11,7 +11,7 @@ on: env: BUILD_TYPE: Debug REPO_NAME: "usersettings" - 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-oop.yml b/.github/workflows/L2-tests-oop.yml index 361e999..54726f3 100755 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.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}} @@ -95,7 +95,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 6f22da2..dd42383 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-usersettings if: ${{ inputs.caller_source == 'local' }} diff --git a/build_dependencies.sh b/build_dependencies.sh index 2bd71ff..982a02a 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -45,9 +45,9 @@ cd .. # 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 main https://github.com/rdkcentral/entservices-apis.git From 1c2aa25da21d6ce4d9f420bcc2115fda540271b8 Mon Sep 17 00:00:00 2001 From: rajaLucy Date: Fri, 24 Jul 2026 12:03:06 +0530 Subject: [PATCH 02/16] RDKEMW-22169:Updated testframework ref and patches to R4.4.6 --- .github/workflows/L1-tests.yml | 12 +++++------- .github/workflows/L2-tests-oop.yml | 12 +++++------- .github/workflows/L2-tests.yml | 12 +++++------- build_dependencies.sh | 12 +++++------- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 0155333..12f63df 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-usersettings 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,11 +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/Jsonrpc_dynamic_error_handling.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-oop.yml b/.github/workflows/L2-tests-oop.yml index 54726f3..6896c59 100755 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -102,7 +102,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: 1.0.14 + ref: feature/RDKEMW-22169 - name: Checkout entservices-persistentstore uses: actions/checkout@v3 @@ -135,7 +135,7 @@ jobs: - name: Apply 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 @@ -155,11 +155,9 @@ 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/Jsonrpc_dynamic_error_handling.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 cd - - name: Build Thunder diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index dd42383..e2af0e2 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 entservices-persistentstore uses: actions/checkout@v3 @@ -131,7 +131,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 @@ -151,11 +151,9 @@ 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/Jsonrpc_dynamic_error_handling.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 cd - - name: Build Thunder diff --git a/build_dependencies.sh b/build_dependencies.sh index 982a02a..c82daa4 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -55,14 +55,14 @@ cd .. git clone --branch develop https://github.com/rdkcentral/entservices-helpers.git cd "$GITHUB_WORKSPACE" -git clone --branch 1.0.12 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 - @@ -81,11 +81,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/Jsonrpc_dynamic_error_handling.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 0c69dc4f08bad7672540049564e62d119878bd0b Mon Sep 17 00:00:00 2001 From: rajaLucy Date: Fri, 24 Jul 2026 15:58:55 +0530 Subject: [PATCH 03/16] RDKEMW-22169: Add LockFixedBuffer_compat_R4.4.6 patch to L2 Thunder patches --- .github/workflows/L2-tests-oop.yml | 1 + .github/workflows/L2-tests.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml index 6896c59..7944764 100755 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -158,6 +158,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/LockFixedBuffer_compat_R4.4.6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index e2af0e2..3d3f3e0 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -154,6 +154,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/LockFixedBuffer_compat_R4.4.6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder From ef83254666140cc46406e8c56c3df393d5890632 Mon Sep 17 00:00:00 2001 From: rajaLucy Date: Mon, 27 Jul 2026 18:19:13 +0530 Subject: [PATCH 04/16] RDKEMW-22169:Reverted json file --- .github/workflows/L2-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 3d3f3e0..e2af0e2 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -154,7 +154,6 @@ 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/LockFixedBuffer_compat_R4.4.6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder From 1c9547b910011a709e1287ce0f1384b8ab6474a5 Mon Sep 17 00:00:00 2001 From: RajaLucy <133349260+RajaLucy@users.noreply.github.com> Date: Mon, 27 Jul 2026 18:37:11 +0530 Subject: [PATCH 05/16] RDKEMW-22169:Update L2-tests-oop.yml --- .github/workflows/L2-tests-oop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml index 7944764..6896c59 100755 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -158,7 +158,6 @@ 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/LockFixedBuffer_compat_R4.4.6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder From 547178e34a9236b7f78479316082643fe8795f25 Mon Sep 17 00:00:00 2001 From: RajaLucy <133349260+RajaLucy@users.noreply.github.com> Date: Tue, 28 Jul 2026 18:18:10 +0530 Subject: [PATCH 06/16] RDKEMW-22169:Update L2-tests-oop.yml --- .github/workflows/L2-tests-oop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml index 6896c59..7944764 100755 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -158,6 +158,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/LockFixedBuffer_compat_R4.4.6.patch patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch cd - - name: Build Thunder From 57797644ac33953fcd0da36661b7ec364f8340d7 Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Thu, 6 Aug 2026 11:44:59 +0530 Subject: [PATCH 07/16] RDKEMW-22169: Updating Thunder branch and sha value --- .github/workflows/L1-tests.yml | 24 +++++------------------- .github/workflows/L2-tests.yml | 20 ++++---------------- build_dependencies.sh | 16 ++++++++++------ 3 files changed, 19 insertions(+), 41 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 c3e3068..b566af1 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -11,6 +11,8 @@ on: env: BUILD_TYPE: Debug REPO_NAME: "usersettings" + THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4" + THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31" INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}} @@ -61,7 +63,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 @@ -106,7 +108,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' @@ -114,7 +116,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 @@ -144,13 +146,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: > @@ -166,15 +161,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 - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Jsonrpc_dynamic_error_handling_R4.4.6.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 old mode 100755 new mode 100644 index 5caa864..4c19a4a --- 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" INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}} @@ -75,14 +77,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-usersettings if: ${{ inputs.caller_source == 'local' }} @@ -127,12 +129,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 @@ -147,14 +143,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/Jsonrpc_dynamic_error_handling_R4.4.6.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 2004f25..2e276a6 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} @@ -45,9 +47,15 @@ cd .. # 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 @@ -62,7 +70,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 - @@ -81,9 +88,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 -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 51e48b7672e3f9947ff55bec9f7802be36699375 Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Thu, 6 Aug 2026 12:17:46 +0530 Subject: [PATCH 08/16] RDKEMW-22169: Updating Thunder branch and sha value --- .github/workflows/L2-tests-oop.yml | 15 ++++----------- .github/workflows/native_full_build.yml | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) mode change 100755 => 100644 .github/workflows/L2-tests-oop.yml diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml old mode 100755 new mode 100644 index 672c7d2..33e2519 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -10,6 +10,8 @@ on: env: BUILD_TYPE: Debug + THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4" + THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31" INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}} @@ -79,7 +81,7 @@ jobs: with: repository: rdkcentral/Thunder path: Thunder - ref: ${{env.THUNDER_REF}} + ref: ${{env.THUNDER_COMMIT_SHA}} - name: Checkout googletest if: steps.cache.outputs.cache-hit != 'true' @@ -94,7 +96,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 @@ -151,15 +153,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/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 run: > cmake diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml index 18390e4..0cea651 100644 --- a/.github/workflows/native_full_build.yml +++ b/.github/workflows/native_full_build.yml @@ -20,4 +20,4 @@ jobs: - name: native build run: | sh -x build_dependencies.sh - sh -x cov_build.sh \ No newline at end of file + sh -x cov_build.sh From 79165c2938d4d6e58c96af7d246f67835ffcf35d Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Thu, 6 Aug 2026 16:04:24 +0530 Subject: [PATCH 09/16] RDKEMW-22169:Update L2-tests-oop.yml --- .github/workflows/L2-tests-oop.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml index 33e2519..17ac1eb 100644 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -133,12 +133,6 @@ jobs: path: entservices-persistentstore ref: develop - - name: Apply 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 From 94e4998e892115a737161f14c99a13dff17d27a5 Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Thu, 6 Aug 2026 16:20:54 +0530 Subject: [PATCH 10/16] RDKEMW-22169:Update L2-tests-oop.yml --- .github/workflows/L2-tests-oop.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml index 17ac1eb..ec68ec2 100644 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -147,6 +147,12 @@ jobs: && cmake --install build/ThunderTools + - name: Apply patches Thunder + run: | + cd $GITHUB_WORKSPACE/Thunder + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/LockFixedBuffer_compat_R4.4.6.patch + cd - + - name: Build Thunder run: > cmake From ac98d96c7f505602e69288b4f429f348fc166122 Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Thu, 6 Aug 2026 16:26:59 +0530 Subject: [PATCH 11/16] RDKEMW-22169: Fix WorkFlow Failures --- .github/workflows/L1-tests.yml | 3 --- .github/workflows/L2-tests-oop.yml | 3 --- .github/workflows/L2-tests.yml | 3 --- cov_build.sh | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index b566af1..38acd8b 100644 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -355,7 +355,6 @@ jobs: -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_FLAGS=" -DEXCEPTIONS_ENABLE=ON - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -413,7 +412,6 @@ jobs: -fprofile-arcs -ftest-coverage -DEXCEPTIONS_ENABLE=ON - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -495,7 +493,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-oop.yml b/.github/workflows/L2-tests-oop.yml index ec68ec2..6894818 100644 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -379,7 +379,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -fprofile-arcs -ftest-coverage - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -465,7 +464,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -fprofile-arcs -ftest-coverage - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -546,7 +544,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/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 4c19a4a..1699094 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -356,7 +356,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -fprofile-arcs -ftest-coverage - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -443,7 +442,6 @@ jobs: -DEXCEPTIONS_ENABLE=ON -fprofile-arcs -ftest-coverage - -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4 @@ -527,7 +525,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/cov_build.sh b/cov_build.sh index dd0533a..bf10e94 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -76,7 +76,7 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-usersettings \ -DENABLE_SYSTEM_GET_STORE_DEMO_LINK -DENABLE_DEEP_SLEEP \ -DENABLE_SET_WAKEUP_SRC_CONFIG -DENABLE_THERMAL_PROTECTION \ -DUSE_DRM_SCREENCAPTURE -DHAS_API_SYSTEM -DHAS_API_POWERSTATE \ --DHAS_RBUS -DDISABLE_SECURITY_TOKEN -DENABLE_DEVICE_MANUFACTURER_INFO -DUSE_THUNDER_R4=ON -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4" \ +-DHAS_RBUS -DDISABLE_SECURITY_TOKEN -DENABLE_DEVICE_MANUFACTURER_INFO -DTHUNDER_VERSION=4 -DTHUNDER_VERSION_MAJOR=4 -DTHUNDER_VERSION_MINOR=4" \ cmake --build build/entservices-usersettings --target install From 800b9c79810aad9c6c8a5cbad24cfee65cbc3192 Mon Sep 17 00:00:00 2001 From: smohap466_comcast Date: Fri, 7 Aug 2026 19:18:15 +0530 Subject: [PATCH 12/16] RDKEMW-22169: Fixing L2 WorkFlow Failure --- .github/workflows/L1-tests.yml | 2 +- .github/workflows/L2-tests-oop.yml | 3 ++- .github/workflows/L2-tests.yml | 3 ++- build_dependencies.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 38acd8b..7c2bbbb 100644 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -123,7 +123,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: feature/RDKEMW-22169 + ref: develop - name: Checkout entservices-usersettings if: ${{ inputs.caller_source == 'local' }} diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml index 6894818..a2c271a 100644 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -103,7 +103,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: feature/RDKEMW-22169 + ref: develop - name: Checkout entservices-persistentstore uses: actions/checkout@v3 @@ -166,6 +166,7 @@ jobs: -DBINDING=127.0.0.1 -DPORT=9998 -DEXCEPTIONS_ENABLE=ON + -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" && cmake --build build/Thunder -j8 && diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 1699094..df5f00c 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -112,7 +112,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: feature/RDKEMW-22169 + ref: develop - name: Checkout entservices-persistentstore uses: actions/checkout@v3 @@ -156,6 +156,7 @@ jobs: -DBINDING=127.0.0.1 -DPORT=9998 -DEXCEPTIONS_ENABLE=ON + -DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins" && cmake --build build/Thunder -j8 && diff --git a/build_dependencies.sh b/build_dependencies.sh index 2e276a6..fd80b4c 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -63,7 +63,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 6d96313b2fdb273b994e168cfa19ea0f1cc2df6a Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Mon, 10 Aug 2026 15:08:20 +0530 Subject: [PATCH 13/16] RDKEMW-22169:Update L1-tests.yml --- .github/workflows/L1-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 7c2bbbb..081bc1f 100644 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -123,7 +123,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: develop + ref: 2.0.0 - name: Checkout entservices-usersettings if: ${{ inputs.caller_source == 'local' }} From 4d281e196dddda23d8f24b70c811414999d5ac8b Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Mon, 10 Aug 2026 15:09:00 +0530 Subject: [PATCH 14/16] RDKEMW-22169:Update L2-tests-oop.yml --- .github/workflows/L2-tests-oop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/L2-tests-oop.yml b/.github/workflows/L2-tests-oop.yml index a2c271a..eace250 100644 --- a/.github/workflows/L2-tests-oop.yml +++ b/.github/workflows/L2-tests-oop.yml @@ -103,7 +103,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: develop + ref: 2.0.0 - name: Checkout entservices-persistentstore uses: actions/checkout@v3 From 9eb0db5f3085417bfbbafd6d8d011b75c24d5e71 Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Mon, 10 Aug 2026 15:10:45 +0530 Subject: [PATCH 15/16] RDKEMW-22169:Update L2-tests.yml --- .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 df5f00c..be2548c 100644 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -112,7 +112,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: develop + ref: 2.0.0 - name: Checkout entservices-persistentstore uses: actions/checkout@v3 From a2a0cfa5f4b1ef4cec16863893fe21682166408b Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Mon, 10 Aug 2026 15:15:44 +0530 Subject: [PATCH 16/16] RDKEMW-22169:Update build_dependencies.sh --- build_dependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build_dependencies.sh b/build_dependencies.sh index fd80b4c..b522ad7 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -47,23 +47,23 @@ cd .. # Clone the required repositories -git clone -b R4_4-RDK https://github.com/rdkcentral/ThunderTools.git +git clone --branch R4_4-RDK https://github.com/rdkcentral/ThunderTools.git cd ThunderTools git checkout $THUNDER_TOOLS_COMMIT_SHA cd .. -git clone -b R4_4-RDK https://github.com/rdkcentral/Thunder.git +git clone --branch 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 +git clone --branch main https://github.com/rdkcentral/entservices-apis.git cd .. git clone --branch develop https://github.com/rdkcentral/entservices-helpers.git cd "$GITHUB_WORKSPACE" -git clone --branch develop https://github.com/rdkcentral/entservices-testframework.git +git clone --branch 2.0.0 https://github.com/rdkcentral/entservices-testframework.git ############################ # Build Thunder-Tools