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

[CI] Ubuntu 24.04 and 22.04 part 3/? #2028

Merged
merged 4 commits into from
Oct 15, 2024
Merged

[CI] Ubuntu 24.04 and 22.04 part 3/? #2028

merged 4 commits into from
Oct 15, 2024

Conversation

woju
Copy link
Member

@woju woju commented Oct 14, 2024

Description of the changes

See #2026 for rationale

How to test this PR?

CI


This change is Reviewable

Base automatically changed from woju/noble-stack-1 to master October 15, 2024 07:18
@woju
Copy link
Member Author

woju commented Oct 15, 2024

Jenkins, test this please

Copy link
Contributor

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r1, 1 of 1 files at r2, 1 of 1 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion, not enough approvals from maintainers (1 more required) (waiting on @woju)


-- commits line 51 at r3:
Not blocking, but this commit message contains a ton of unnecessary info. Why not simply:

[LibOS/tests] Fix openmp manifest to add shm tmpfs

There is a known issue in some versions of `libomp` (the
LLVM implementation of OpenMP), and probably also in `libiomp` (Intel
implementation of OpenMP). Those versions require /dev/shm to
exist. This commit modifies the openmp manifest to add this dir as a
tmpfs mount. With this fix, the files under /dev/shm/ are not visible on
the host, so security of the application remains intact.

Based on the suggestion by Dmitrii Kuvaiskii. See 
https://github.com/gramineproject/gramine/discussions/1780#discussioncomment-8589083

Copy link
Contributor

@kailun-qin kailun-qin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r1, 1 of 1 files at r2, 1 of 1 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @dimakuv)


-- commits line 51 at r3:

Previously, dimakuv (Dmitrii Kuvaiskii) wrote…

Not blocking, but this commit message contains a ton of unnecessary info. Why not simply:

[LibOS/tests] Fix openmp manifest to add shm tmpfs

There is a known issue in some versions of `libomp` (the
LLVM implementation of OpenMP), and probably also in `libiomp` (Intel
implementation of OpenMP). Those versions require /dev/shm to
exist. This commit modifies the openmp manifest to add this dir as a
tmpfs mount. With this fix, the files under /dev/shm/ are not visible on
the host, so security of the application remains intact.

Based on the suggestion by Dmitrii Kuvaiskii. See 
https://github.com/gramineproject/gramine/discussions/1780#discussioncomment-8589083

+1 (for not leaving my wrong suggestion in the commit msg) :)

Copy link
Member Author

@woju woju left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 4 of 5 files reviewed, all discussions resolved (waiting on @dimakuv and @kailun-qin)


-- commits line 51 at r3:

Previously, kailun-qin (Kailun Qin) wrote…

+1 (for not leaving my wrong suggestion in the commit msg) :)

Done.

:)

mkow
mkow previously approved these changes Oct 15, 2024
Copy link
Member

@mkow mkow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r1, 1 of 1 files at r2, 1 of 1 files at r4, 1 of 1 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

kailun-qin
kailun-qin previously approved these changes Oct 15, 2024
Copy link
Contributor

@kailun-qin kailun-qin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

dimakuv
dimakuv previously approved these changes Oct 15, 2024
Copy link
Contributor

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Signed-off-by: Wojtek Porczyk <woju@invisiblethingslab.com>
- Make wrk2 dependency optional. The wrk2 tool adds -R option to wrk
  tool, however, wrk2 is not packaged for Debian/Ubuntu, but wrk is. If
  wrk2 is not available, then we can just use vanilla wrk tool.

- Convert bc arithmetic to python3 -c. This removes bc dependency in
  favour of python3, which is always available, because it's
  a dependency of both Gramine tooling and build system.

  (POSIX shell arithmetic substitution does not support decimal, so it's
  not suitable).

Signed-off-by: Wojtek Porczyk <woju@invisiblethingslab.com>
Signed-off-by: Wojtek Porczyk <woju@invisiblethingslab.com>
There is a known issue in some versions of `libomp` (the
LLVM implementation of OpenMP), and probably also in `libiomp` (Intel
implementation of OpenMP). Those versions require /dev/shm to
exist. This commit modifies the openmp manifest to add this dir as a
tmpfs mount. With this fix, the files under /dev/shm/ are not visible on
the host, so security of the application remains intact.

Based on the suggestion by Dmitrii Kuvaiskii. See
#1780 (comment)

Signed-off-by: Wojtek Porczyk <woju@invisiblethingslab.com>
Copy link
Contributor

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 7 files at r6, 4 of 4 files at r7, 1 of 1 files at r8, 1 of 1 files at r9, all commit messages.
Reviewable status: all files reviewed, all discussions resolved, not enough approvals from maintainers (1 more required)

Copy link
Member

@mkow mkow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 7 of 7 files at r6, 4 of 4 files at r7, 1 of 1 files at r8, 1 of 1 files at r9, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@kailun-qin kailun-qin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 6 of 7 files at r6, 4 of 4 files at r7, 1 of 1 files at r8, 1 of 1 files at r9, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@woju woju merged commit 16d076d into master Oct 15, 2024
20 of 34 checks passed
@woju woju deleted the woju/noble-stack-2 branch October 15, 2024 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants