Skip to content

Commit cc36a87

Browse files
[RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to specific entservices for inputoutput repo (#123)
* modifying the path name of the patch files for all the yml's * Update L1-tests.yml * patch set * Modifying INTERFACES_REF * Modifying build_dependencies.sh --------- Co-authored-by: Pesala Lakshmi Jwala Priya <[email protected]> Co-authored-by: PriyaPesala <[email protected]>
1 parent 3034d01 commit cc36a87

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

.github/workflows/L1-tests.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
BUILD_TYPE: Debug
1111
THUNDER_REF: "R4.4.1"
12-
INTERFACES_REF: "main"
12+
INTERFACES_REF: "develop"
1313
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
1414
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
1515

@@ -124,7 +124,7 @@ jobs:
124124
- name: Apply patches ThunderTools
125125
run: |
126126
cd $GITHUB_WORKSPACE/ThunderTools
127-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
127+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
128128
cd -
129129
130130
- name: Build ThunderTools
@@ -145,10 +145,10 @@ jobs:
145145
- name: Apply patches Thunder
146146
run: |
147147
cd $GITHUB_WORKSPACE/Thunder
148-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
149-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
150-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
151-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
148+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
149+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
150+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
151+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
152152
cd -
153153
154154
- name: Build Thunder
@@ -638,3 +638,4 @@ jobs:
638638
rdkL1TestResultsWithoutValgrind.json
639639
rdkL1TestResultsWithValgrind.json
640640
if-no-files-found: warn
641+

.github/workflows/L2-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
BUILD_TYPE: Debug
99
THUNDER_REF: "R4.4.1"
10-
INTERFACES_REF: "main"
10+
INTERFACES_REF: "develop"
1111
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
1212
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
1313

@@ -92,7 +92,7 @@ jobs:
9292
- name: Apply patches ThunderTools
9393
run: |
9494
cd $GITHUB_WORKSPACE/ThunderTools
95-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
95+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
9696
cd -
9797
9898
- name: Build ThunderTools
@@ -112,10 +112,10 @@ jobs:
112112
- name: Apply patches Thunder
113113
run: |
114114
cd $GITHUB_WORKSPACE/Thunder
115-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
116-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
117-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
118-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
115+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
116+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
117+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
118+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
119119
cd -
120120
- name: Build Thunder
121121
run: >

build_dependencies.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ git clone https://[email protected]/rdkcentral/entservices-testframework.
4040
echo "======================================================================================"
4141
echo "buliding thunderTools"
4242
cd ThunderTools
43-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
43+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
4444
cd -
4545

4646

@@ -59,10 +59,10 @@ echo "==========================================================================
5959
echo "buliding thunder"
6060

6161
cd Thunder
62-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
63-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
64-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
65-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
62+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
63+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
64+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
65+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
6666
cd -
6767

6868
cmake -G Ninja -S Thunder -B build/Thunder \

0 commit comments

Comments
 (0)