Checkbox IIoTG

Merge ~liaou3/checkbox-iiotg/+git/checkbox-iiotg-classic:add_tsn_tools into ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic:master

  1. Git
  2. lp:~liaou3/checkbox-iiotg/+git/checkbox-iiotg-classic
  3. add_tsn_tools
  4. Merge into master
Proposed by Vincent Liao
Status: Merged
Approved by: Vincent Liao
Approved revision: 5a5d8f3f6440bd0553db8bf9e205c6da76e311a1
Merged at revision: 728408560a11a31e21cd9c8ca3d50dce1a52a3e7
Proposed branch: ~liaou3/checkbox-iiotg/+git/checkbox-iiotg-classic:add_tsn_tools
Merge into: ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic:master
Diff against target: 36 lines (+17/-0)
2 files modified
config/config_vars (+4/-0)
snap/snapcraft.yaml (+13/-0)
Reviewer Review Type Date Requested Status
Rick Wu Approve
PeiYao Chang Approve
StanleyHuang Pending
Vic Liu Pending
Patrick Liu Pending
Review via email: mp+451704@code.launchpad.net

Commit message

Add TSN testing tools and tsn server environment variables

Description of the change

In snapcraft.yaml
 - Add tsn-talker, tsn-listener, udp_tai for further use in checkbox-provider-iiotg
In config_vars
 - Add TSN_SERVER relevant variable for further use in checkbox-provider-iiotg

Relevant MR: https://code.launchpad.net/~liaou3/checkbox-iiotg/+git/checkbox-provider-intliotg/+merge/451717

To post a comment you must log in.
Revision history for this message
PeiYao Chang (baconyao) wrote :

LGTM

review: Approve
Revision history for this message
Rick Wu (rickwu4444) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config/config_vars b/config/config_vars
2index 1bef9e3..9ed75b1 100644
3--- a/config/config_vars
4+++ b/config/config_vars
5@@ -42,3 +42,7 @@ MODEL_GRADE=signed
6 WATCHDOG_TYPE=wdat_wdt
7 WATCHDOG_IDENTITY=wdat_wdt
8 CYCLICTEST_DURATION=86400
9+TSN_SERVER_IP=10.102.88.87
10+TSN_SERVER_USER=u
11+TSN_SERVER_PWD=u
12+TSN_SERVER_INTERFACE=enp2s0
13diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
14index 361fb6f..1757c02 100644
15--- a/snap/snapcraft.yaml
16+++ b/snap/snapcraft.yaml
17@@ -73,6 +73,19 @@ parts:
18 python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-intliotg --root="$SNAPCRAFT_PART_INSTALL"
19 build-packages:
20 - python3-jinja2
21+ tsn-tools:
22+ plugin: nil
23+ build-packages:
24+ - gcc
25+ - libc6-dev
26+ override-build: |
27+ mkdir -p ${SNAPCRAFT_PART_INSTALL}/usr/bin
28+ gcc ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-talker.c -o ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-talker
29+ cp -v ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-talker ${SNAPCRAFT_PART_INSTALL}/usr/bin/
30+ gcc ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-listener.c -o ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-listener
31+ cp -v ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-listener ${SNAPCRAFT_PART_INSTALL}/usr/bin/
32+ gcc ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/udp_tai.c -o ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/udp_tai -lpthread
33+ cp -v ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/udp_tai ${SNAPCRAFT_PART_INSTALL}/usr/bin/
34 parts-meta-info:
35 plugin: nil
36 build-attributes: [no-patchelf]

Subscribers

People subscribed via source and target branches