Merge pull request #3678 from rina23q/fix/misc-fix-for-diagnostic-collection

chore: add template.sh.ignore to package and fix typo

Author: rina23q

configuration/package_manifests/nfpm.tedge.yaml

@@ -128,3 +128,8 @@ contents:
     dst: /usr/share/tedge/diag-plugins/
     file_info:
       mode: 0755
+
+  - src: ./configuration/contrib/diag-plugins/template.sh.ignore
+    dst: /usr/share/tedge/diag-plugins/
+    file_info:
+      mode: 0755

tests/RobotFramework/tests/tedge/diag/tedge_diac_collect.robot renamed to tests/RobotFramework/tests/tedge/diag/tedge_diag_collect.robot

@@ -60,8 +60,8 @@ Validate preset plugins
     [Arguments]    ${tarball_name}
     ${result}=    Execute Command    ls /usr/share/tedge/diag-plugins
     ${plugins}=    Split String    ${result}    \n
-    ${cleared_list}=    Evaluate    [x for x in @{plugins} if x]
-    FOR    ${plugin}    IN    @{cleared_list}
+    ${filtered_plugins}=    Evaluate    [x for x in ${plugins} if x and not x.endswith('.ignore')]
+    FOR    ${plugin}    IN    @{filtered_plugins}
         ${base}=    Replace String    ${plugin}    .sh    ${EMPTY}
         File Should Exist    /tmp/${tarball_name}/${base}/output.log
     END