Skip to content
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.

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

bump some helpers. #809

Merged
merged 17 commits into from
Oct 7, 2024
Merged

Conversation

brianmcgillion
Copy link
Collaborator

@brianmcgillion brianmcgillion commented Oct 1, 2024

Description of changes

a flake bump with some new package versions

Changes for givc

  • fix application restart issue
  • add additional optional arguments to givc-cli
  • add locale and timezone setting across the system
  • reduce log output
  • improved internal testing
  • various smaller improvements

Application Definition

Instead of a JSON string, application definition now works by defining a list of application such as:

applications = [
  {
    name = "<application name>";
    command = "<application command>";
    args = [ "url" "flag" ];
  }
];

The (optional) args parameter defines which argument types are allowed. Currently, there are two:

  1. Boolean flags / switches, such as --incognito
  2. URLs, such as https://cnn.com

The reason for this whitelisting is that these parameters are validated to avoid injection attacks.

Currently allowed by default:

  1. Chromium in chromium-vm: URL and Flags
  2. Chromium in business-vm: URL

Application arguments via givc-cli

CLI arguments can be passed via the givc-cli as follows:

/nix/store/dfy9zpmxw8cps31krcfl4zw8za8f6c9y-givc-0.0.1-cli/bin/givc-cli --name admin-vm-debug --addr 192.168.101.10 --port 9001 --notls  start chromium -- https://teams.microsoft.com --incognito

There is no limit on the amount of parameters.

(remember to use the lastest cli, for quick testing on running system use cat /run/current-system/sw/share/applications/Chromium.desktop, in guivm)

Checklist for things done

  • Summary of the proposed changes in the PR description
  • More detailed description in the commit message(s)
  • Commits are squashed into relevant entities - avoid a lot of minimal dev time commits in the PR
  • Contribution guidelines followed
  • Ghaf documentation updated with the commit - https://tiiuae.github.io/ghaf/
  • PR linked to architecture documentation and requirement(s) (ticket id)
  • Test procedure described (or includes tests). Select one or more:
    • Tested on Lenovo X1 x86_64
    • Tested on Jetson Orin NX or AGX aarch64
    • Tested on Polarfire riscv64
  • Author has run make-checks and it passes
  • All automatic Github Action checks pass - see actions
  • Author has added reviewers and removed PR draft status
  • Change requires full re-installation
  • [] Change can be updated with nixos-rebuild ... switch
    • Because of the rebase onto some changes in the previous commits it is best to flash a fresh image before testing

Instructions for Testing

  • List all targets that this applies to: Lenovo X1
  • Is this a new feature
    • List the test steps to verify:
    • Full regression test including application starting, reboot, power off
    • Test givc-cli args with parameters as described above (check which are allowed per application, other will fail)
    • Verify (manual) application restart after crash works
    • Verify log-out/login bug is resolved
  • If it is an improvement how does it impact existing functionality?

@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 05:22 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 05:54 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 09:13 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 09:24 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 12:35 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 14:16 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 14:34 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 14:45 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 16:12 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 16:15 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion mentioned this pull request Oct 1, 2024
19 tasks
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 1, 2024 18:44 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 2, 2024 05:08 — with GitHub Actions Inactive
@humaidq-tii humaidq-tii mentioned this pull request Oct 2, 2024
19 tasks
@brianmcgillion brianmcgillion marked this pull request as draft October 2, 2024 06:20
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 4, 2024 08:54 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 4, 2024 09:01 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 4, 2024 11:57 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow October 4, 2024 12:35 — with GitHub Actions Inactive
Signed-off-by: Manuel Bluhm <manuel@ssrc.tii.ae>
mbssrc and others added 3 commits October 5, 2024 15:00
Signed-off-by: Manuel Bluhm <manuel@ssrc.tii.ae>
Some how these were missed when the impermanence was enabled.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
- fix application restart issue
- add additional optional arguments to givc-cli
- add locale and timezone setting
- various smaller improvements

Signed-off-by: Manuel Bluhm <manuel@ssrc.tii.ae>
@barnabakos
Copy link
Collaborator

17 commits up to: c4a6cbb
PR is on top of latest tip of Ghaf main: e037186

platform: Lenovo X1 Carbon; flash script; USB SSD

  • ci-test-automation suite: ok
  • starting apps: ok
  • regression / ad-hoc testing: ok

works:

  • starting apps with givc-cli; NOTE: only the browsers can take argument(s)
  • apps can be started after logout-login (SSRCSP-5262)

notes:

  • even though all apps can be started after logout / login, there are lots of error messages:
2024-10-05T05:26:46.053172Z ERROR Status of appflowy@0.service is failed, instead of active. Recovering.
2024-10-05T05:26:46.047498Z ERROR Status of zathura@0.service is failed, instead of active. Recovering.
2024-10-05T05:26:46.035635Z ERROR Status of gnome-text-editor@0.service is failed, instead of active. Recovering.
2024-10-05T05:26:46.033876Z ERROR Status of slack@0.service is failed, instead of active. Recovering.
2024-10-05T05:26:46.031838Z ERROR Status of losslesscut@0.service is failed, instead of active. Recovering.
2024-10-05T05:26:46.030004Z ERROR Status of chromium@0.service is failed, instead of active. Recovering.
2024-10-05T05:26:46.028295Z ERROR Status of gpclient@0.service is failed, instead of active. Recovering.

it can be seen continuously in the logs (admin-vm);
this is not happening in the mainline build;
seems to be random services after every restart-logout-login

issues:

  • N/A

platform: NVIDIA Jetson AGX Orin; cross-compile; flash script

  • ci-test-automation suite: ok
  • starting apps: ok (with "ghaf-open" command)
  • regression / ad-hoc testing: ok

works:

  • boot, starting apps, logout & login

notes:

  • taskbar is not available; same as in mainline build

issues:

  • N/A

@barnabakos barnabakos added Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon Tested on Orin AGX Cross This PR has been tested on NVIDIA Jetson AGX Orin cross-compiled labels Oct 6, 2024
@barnabakos barnabakos mentioned this pull request Oct 6, 2024
23 tasks
@brianmcgillion brianmcgillion mentioned this pull request Oct 7, 2024
19 tasks
@johannarautanen
Copy link

johannarautanen commented Oct 7, 2024

Tested with NVIDIA Jetson AGX Orin native: commit: c4a6cbb
Flash script.

ci-test-automation suite: ok

starting apps: ok, after opening apps-menu with Windows-button.
(Missing taskbar: https://jira.tii.ae/browse/SSRCSP-5322

regression / ad-hoc testing: ok

Tested with RISC-V (packages.riscv64-linux.microchip-icicle-kit-debug)
Commit: c4a6cbb

ci-test-automation suite: ok
regression / ad-hoc testing: ok

Tested with NVIDIA Jetson NX Orin native: commit: c4a6cbb
Flash to memory stick

ci-test-automation suite: ok

starting apps: ok, after opening apps-menu with Windows-button.
(Missing taskbar: https://jira.tii.ae/browse/SSRCSP-5322

regression / ad-hoc testing: ok

@johannarautanen johannarautanen added Tested on Orin AGX This PR has been tested on NVIDIA Jetson AGX Orin Tested on RISC-V This PR has been tested on RISC-V - Microchip Polarfire Icicle-kit board and removed Needs Testing CI Team to pre-verify labels Oct 7, 2024
@johannarautanen johannarautanen added the Tested on Orin NX This PR has been tested on NVIDIA Jetson NX Orin label Oct 7, 2024
@brianmcgillion brianmcgillion merged commit 1a920c4 into tiiuae:main Oct 7, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon Tested on Orin AGX Cross This PR has been tested on NVIDIA Jetson AGX Orin cross-compiled Tested on Orin AGX This PR has been tested on NVIDIA Jetson AGX Orin Tested on Orin NX This PR has been tested on NVIDIA Jetson NX Orin Tested on RISC-V This PR has been tested on RISC-V - Microchip Polarfire Icicle-kit board
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants