Skip to content

RDKEMW-22169:Updated version to 4.4.6 #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RajaLucy wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

RDKEMW-22169:Updated version to 4.4.6 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
af451ac
RDKEMW-22169:Updated version to 4.4.6
RajaLucy Jul 23, 2026
1c2aa25
RDKEMW-22169:Updated testframework ref and patches to R4.4.6
RajaLucy Jul 24, 2026
0c69dc4
RDKEMW-22169: Add LockFixedBuffer_compat_R4.4.6 patch to L2 Thunder p…
RajaLucy Jul 24, 2026
ef83254
RDKEMW-22169:Reverted json file
RajaLucy Jul 27, 2026
1c9547b
RDKEMW-22169:Update L2-tests-oop.yml
RajaLucy Jul 27, 2026
547178e
RDKEMW-22169:Update L2-tests-oop.yml
RajaLucy Jul 28, 2026
53f6c1c
Merge branch 'develop' into feature/RDKEMW-22169
srinibas15 Aug 6, 2026
5779764
RDKEMW-22169: Updating Thunder branch and sha value
srinibas104 Aug 6, 2026
51e48b7
RDKEMW-22169: Updating Thunder branch and sha value
srinibas104 Aug 6, 2026
79165c2
RDKEMW-22169:Update L2-tests-oop.yml
srinibas15 Aug 6, 2026
94e4998
RDKEMW-22169:Update L2-tests-oop.yml
srinibas15 Aug 6, 2026
ac98d96
RDKEMW-22169: Fix WorkFlow Failures
srinibas104 Aug 6, 2026
800b9c7
RDKEMW-22169: Fixing L2 WorkFlow Failure
srinibas104 Aug 7, 2026
6d96313
RDKEMW-22169:Update L1-tests.yml
srinibas15 Aug 10, 2026
4d281e1
RDKEMW-22169:Update L2-tests-oop.yml
srinibas15 Aug 10, 2026
9eb0db5
RDKEMW-22169:Update L2-tests.yml
srinibas15 Aug 10, 2026
a2a0cfa
RDKEMW-22169:Update build_dependencies.sh
srinibas15 Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 7 additions & 27 deletions .github/workflows/L1-tests.yml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ on:
env:
BUILD_TYPE: Debug
REPO_NAME: "usersettings"
THUNDER_REF: "R4.4.1"
INTERFACES_REF: "4.0.8"
THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4"
THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31"
INTERFACES_REF: "develop"
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
Comment thread
srinibas15 marked this conversation as resolved.
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
Comment thread
RajaLucy marked this conversation as resolved.
ENABLE_CACHE: "false"
Expand Down Expand Up @@ -62,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
Expand Down Expand Up @@ -107,22 +108,22 @@ 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'
uses: actions/checkout@v3
with:
repository: rdkcentral/ThunderTools
path: ThunderTools
ref: R4.4.3
ref: ${{env.THUNDER_TOOLS_COMMIT_SHA}}

- name: Checkout entservices-testframework
uses: actions/checkout@v3
with:
repository: rdkcentral/entservices-testframework
path: entservices-testframework
ref: 1.0.14
ref: 2.0.0

- name: Checkout entservices-usersettings
if: ${{ inputs.caller_source == 'local' }}
Expand All @@ -145,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-Add-support-for-project-dir.patch
cd -

- name: Build ThunderTools
if: steps.cache.outputs.cache-hit != 'true'
run: >
Expand All @@ -167,17 +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/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
cd -

- name: Build Thunder
if: steps.cache.outputs.cache-hit != 'true'
run: >
Expand Down Expand Up @@ -372,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
Expand Down Expand Up @@ -430,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
Expand Down Expand Up @@ -512,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
Expand Down
29 changes: 9 additions & 20 deletions .github/workflows/L2-tests-oop.yml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ on:

env:
BUILD_TYPE: Debug
THUNDER_REF: "R4.4.1"
INTERFACES_REF: "4.0.8"
THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4"
THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31"
INTERFACES_REF: "develop"
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
Comment thread
RajaLucy marked this conversation as resolved.
Comment thread
srinibas15 marked this conversation as resolved.

Expand Down Expand Up @@ -80,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'
Expand All @@ -95,14 +96,14 @@ jobs:
with:
repository: rdkcentral/ThunderTools
path: ThunderTools
ref: R4.4.3
ref: ${{env.THUNDER_TOOLS_COMMIT_SHA}}

- name: Checkout entservices-testframework
uses: actions/checkout@v3
with:
repository: rdkcentral/entservices-testframework
path: entservices-testframework
ref: 1.0.14
ref: 2.0.0

- name: Checkout entservices-persistentstore
uses: actions/checkout@v3
Expand Down Expand Up @@ -132,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-Add-support-for-project-dir.patch
cd -

- name: Build ThunderTools
run: >
cmake
Expand All @@ -155,13 +150,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/Increase_Timout_For_L2Tests_Plugin.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/LockFixedBuffer_compat_R4.4.6.patch
cd -

- name: Build Thunder
run: >
cmake
Expand All @@ -175,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
&&
Expand Down Expand Up @@ -388,7 +380,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down Expand Up @@ -474,7 +465,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down Expand Up @@ -555,7 +545,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down
31 changes: 7 additions & 24 deletions .github/workflows/L2-tests.yml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ on:

env:
BUILD_TYPE: Debug
THUNDER_REF: "R4.4.1"
INTERFACES_REF: "4.0.8"
THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4"
THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31"
INTERFACES_REF: "develop"
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
Comment thread
RajaLucy marked this conversation as resolved.
Comment thread
srinibas15 marked this conversation as resolved.

Expand Down Expand Up @@ -76,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.3
ref: ${{env.THUNDER_TOOLS_COMMIT_SHA}}

- name: Checkout entservices-usersettings
if: ${{ inputs.caller_source == 'local' }}
Expand Down Expand Up @@ -111,7 +112,7 @@ jobs:
with:
repository: rdkcentral/entservices-testframework
path: entservices-testframework
ref: 1.0.14
ref: 2.0.0

- name: Checkout entservices-persistentstore
uses: actions/checkout@v3
Expand All @@ -128,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-Add-support-for-project-dir.patch
cd -

- name: Build ThunderTools
run: >
cmake
Expand All @@ -148,16 +143,6 @@ jobs:
&&
cmake --install build/ThunderTools

- 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/Increase_Timout_For_L2Tests_Plugin.patch
cd -
- name: Build Thunder
run: >
cmake
Expand All @@ -171,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
&&
Expand Down Expand Up @@ -371,7 +357,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down Expand Up @@ -458,7 +443,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down Expand Up @@ -542,7 +526,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/native_full_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
- name: native build
run: |
sh -x build_dependencies.sh
sh -x cov_build.sh
sh -x cov_build.sh
22 changes: 12 additions & 10 deletions build_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -45,24 +47,29 @@ cd ..
# Clone the required repositories


git clone --branch R4.4.3 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 --branch R4.4.1 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 1.0.12 https://github.com/rdkcentral/entservices-testframework.git
git clone --branch 2.0.0 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
cd -


Expand All @@ -81,11 +88,6 @@ 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
cd -

cmake -G Ninja -S Thunder -B build/Thunder \
Expand Down
2 changes: 1 addition & 1 deletion cov_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading