Skip to content

Feature/xs9 merge to master #5816

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

Merged
merged 18 commits into from
Jul 16, 2024
Merged

Feature/xs9 merge to master #5816

merged 18 commits into from
Jul 16, 2024

Conversation

liulinC
Copy link
Collaborator

@liulinC liulinC commented Jul 12, 2024

Tested:

  • Ring3: BVT+BST 200899 (Dev Run) Pass
  • Repository Update Testing: 200902 (Dev Run) Pass (one unrelated failure)
  • dummyrepoupdate.seq 4048674 Pass

liulinC and others added 16 commits March 7, 2024 10:12
Signed-off-by: Lin Liu <lin.liu@citrix.com>
CA-389241: import-update-key compat with xs8 and xs9
* CP-46944: Update yum plugins to dnf plugins

Signed-off-by: Lin Liu <lin.liu@citrix.com>

* CP-46944: Update unittest to make github CI happy

github CI has issues with
- ubuntu-22.04 container
- python11
- python3-dnf

Instead of patching the upstreams, we just provide a stub for
the fix
Signed-off-by: Lin Liu <lin.liu@citrix.com>

---------

Signed-off-by: Lin Liu <lin.liu@citrix.com>
* CP-45921: Use dnf as package manager for XS9

 Given XS9 has updated to dnf and no yum is available,
 xapi will choose package manager basing on following
 - If dnf exists, use dnf
 - otherwise, fallback to yum
 xapi just presume dnf or yum is available in the system.

 Because xapi decides to use dnf or yum according to the running
 environment, this commit is compatible with yum/xs8 and dnf/xs9

Signed-off-by: Lin Liu <lin.liu@citrix.com>

* CP-45921: Code refine for
- Move test code to its own suite
- Replace `active` with `manager`, which is static
- Add cmd_line record type to abstract cmd line type
- Refine doc comment and license

---------

Signed-off-by: Lin Liu <lin.liu@citrix.com>
The default gpg public keyring database updated
- pubring.kbx for new gpg on XS9
- pubring.gpg for old gpg on XS8
Detect whether pubring.kbx exists and fallback to old one for XS8

Signed-off-by: Lin Liu <lin.liu@citrix.com>
* CP-48221: Update plugin detect package manager dynamically

Given XS9 has deplicated yum with dnf, to be compatible with XS8,
- Use dnf if dnf is detected
- Fallback to yum otherwise

Signed-off-by: Lin Liu <lin.liu@citrix.com>

* CP-48221: Make CI happy with various scans

---------

Signed-off-by: Lin Liu <lin.liu@citrix.com>
Co-authored-by: Luca Zhang <feiya.zhang@cloud.com>
Signed-off-by: Stephen Cheng <stephen.cheng@cloud.com>
Signed-off-by: Stephen Cheng <stephen.cheng@cloud.com>
…nc_xs9_with_master

Routine sync xs9 with master
Signed-off-by: Lin Liu <Lin.Liu01@cloud.com>
@liulinC
Copy link
Collaborator Author

liulinC commented Jul 15, 2024

Note: This PR should be merged together with xapi.spec repo

@liulinC liulinC requested a review from psafont July 15, 2024 09:35
Copy link
Contributor

@lindig lindig left a comment

Choose a reason for hiding this comment

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

I'm not reviewing this in detail because it was reviewed previously.

@liulinC liulinC merged commit 04c1055 into master Jul 16, 2024
27 checks passed
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.

5 participants