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

[tests-only][full-ci]Remove os enviroment duplication from ocis wrapper #10894

Merged
merged 1 commit into from
Jan 21, 2025

Conversation

amrita-shrestha
Copy link
Contributor

@amrita-shrestha amrita-shrestha commented Jan 20, 2025

Description

This PR resolves the issue of unwanted OS environment duplication in the OCIS wrapper when the rollback API is triggered.

Before

2025/01/20 14:48:40 [ociswrapper] os enviroment while staring ocis [SYSTEMD_EXEC_PID=xxx SSH_AUTH_SOCK=/run/xxxx/xxxx/keyring/ssh SESSION_MANAGER=local/xxxx:@/tmp/.ICE-unix/xxxx,unix/xxxx:/tmp/.ICE-unix/3446 GNOME_TERMINAL_SCREEN=/org/gnome/xxxx LANG=en_US.UTF-8 XDG_CURRENT_DESKTOP=ubuntu:GNOME PWD=/xxxx WAYLAND_DISPLAY=wayland-0 LC_IDENTIFICATION=xxx QT_IM_MODULE=xxx LC_MEASUREMENT=bho_NP DESKTOP_SESSION=ubuntu XDG_MENU_PREFIX=gnome- PNPM_HOME=/home/amrita/.local/share/pnpm PROXY_ENABLE_BASIC_AUTH=true 

SYSTEMD_EXEC_PID=xxx SSH_AUTH_SOCK=/run/xxxx/xxxx/keyring/ssh SESSION_MANAGER=local/xxxx:@/tmp/.ICE-unix/xxxx,unix/xxxx:/tmp/.ICE-unix/3446 GNOME_TERMINAL_SCREEN=/org/gnome/xxxx LANG=en_US.UTF-8 XDG_CURRENT_DESKTOP=ubuntu:GNOME PWD=/xxxx WAYLAND_DISPLAY=wayland-0 LC_IDENTIFICATION=xxx QT_IM_MODULE=xxx LC_MEASUREMENT=bho_NP DESKTOP_SESSION=ubuntu XDG_MENU_PREFIX=gnome- PNPM_HOME=/home/amrita/.local/share/pnpm PROXY_ENABLE_BASIC_AUTH=true ]

After

2025/01/20 14:53:58 [ociswrapper] os enviroment while staring ocis [SYSTEMD_EXEC_PID=xxx SSH_AUTH_SOCK=/run/xxxx/xxxx/keyring/ssh SESSION_MANAGER=local/xxxx:@/tmp/.ICE-unix/xxxx,unix/xxxx:/tmp/.ICE-unix/3446 GNOME_TERMINAL_SCREEN=/org/gnome/xxxx LANG=en_US.UTF-8 XDG_CURRENT_DESKTOP=ubuntu:GNOME PWD=/xxxx WAYLAND_DISPLAY=wayland-0 LC_IDENTIFICATION=xxx QT_IM_MODULE=xxx LC_MEASUREMENT=bho_NP DESKTOP_SESSION=ubuntu XDG_MENU_PREFIX=gnome- PNPM_HOME=/home/amrita/.local/share/pnpm PROXY_ENABLE_BASIC_AUTH=true 

Related Issue

Motivation and Context

How Has This Been Tested?

  • locally

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Copy link
Member

@saw-jan saw-jan left a comment

Choose a reason for hiding this comment

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

👍

@saw-jan saw-jan merged commit 3fc5ae9 into master Jan 21, 2025
4 checks passed
@saw-jan saw-jan deleted the remove-duplication-of-os-env branch January 21, 2025 07:19
ownclouders pushed a commit that referenced this pull request Jan 21, 2025
[tests-only][full-ci]Remove os enviroment duplication from ocis wrapper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants