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

CA-389241: import-update-key compat with xs8 and xs9 #5483

Merged
merged 1 commit into from
Mar 8, 2024

Conversation

liulinC
Copy link
Collaborator

@liulinC liulinC commented Mar 4, 2024

XS9 3943842

[08:13:19 04/03] SSH root@10.63.81.27 /opt/xensource/debug/import-update-key /opt/xenrt/keys/RPM-GPG-KEY-XS-Eng-Test.pub
gpg: key 7610CBCE078E581F: public key "XS Eng test key <XenServerEngineering@citrite.net>" imported
gpg: Total number processed: 1
gpg:               imported: 1

gpg: checking the trustdb
gpg: marginals needed: 3  completes needed: 1  trust model: pgp
gpg: depth: 0  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 0f, 2u
pub  rsa2048/7610CBCE078E581F
     created: 2024-01-08  expires: 2024-07-06  usage: SCEA
     trust: unknown       validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>

pub  rsa2048/7610CBCE078E581F
     created: 2024-01-08  expires: 2024-07-06  usage: SCEA
     trust: unknown       validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>

Please decide how far you trust this user to correctly verify other users' keys
(by looking at passports, checking fingerprints from different sources, etc.)

  1 = I don't know or won't say
  2 = I do NOT trust
  3 = I trust marginally
  4 = I trust fully
  5 = I trust ultimately
  m = back to the main menu


pub  rsa2048/7610CBCE078E581F
     created: 2024-01-08  expires: 2024-07-06  usage: SCEA
     trust: ultimate      validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>
Please note that the shown key validity is not necessarily correct
unless you restart the program.


pub  rsa2048/7610CBCE078E581F
     created: 2024-01-08  expires: 2024-07-06  usage: SCEA
     trust: ultimate      validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>

XS8 25618140

[07:59:24 04/03] SSH root@10.62.65.39 /opt/xensource/debug/import-update-key /opt/xenrt/keys/RPM-GPG-KEY-XS-Eng-Test.pub
gpg: key 078E581F: public key "XS Eng test key <XenServerEngineering@citrite.net>" imported
gpg: Total number processed: 1
gpg:               imported: 1  (RSA: 1)

gpg: checking the trustdb
gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
gpg: depth: 0  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 0f, 2u
pub  2048R/078E581F  created: 2024-01-08  expires: 2024-07-06  usage: SCEA
                     trust: unknown       validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>

pub  2048R/078E581F  created: 2024-01-08  expires: 2024-07-06  usage: SCEA
                     trust: unknown       validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>

Please decide how far you trust this user to correctly verify other users' keys
(by looking at passports, checking fingerprints from different sources, etc.)

  1 = I don't know or won't say
  2 = I do NOT trust
  3 = I trust marginally
  4 = I trust fully
  5 = I trust ultimately
  m = back to the main menu


pub  2048R/078E581F  created: 2024-01-08  expires: 2024-07-06  usage: SCEA
                     trust: ultimate      validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>
Please note that the shown key validity is not necessarily correct
unless you restart the program.


pub  2048R/078E581F  created: 2024-01-08  expires: 2024-07-06  usage: SCEA
                     trust: ultimate      validity: unknown
[ unknown] (1). XS Eng test key <XenServerEngineering@citrite.net>

scripts/import-update-key Fixed Show fixed Hide fixed
scripts/import-update-key Fixed Show fixed Hide fixed
scripts/import-update-key Fixed Show resolved Hide resolved
scripts/import-update-key Fixed Show fixed Hide fixed
scripts/import-update-key Fixed Show fixed Hide fixed
scripts/import-update-key Fixed Show fixed Hide fixed
scripts/import-update-key Fixed Show fixed Hide fixed
scripts/import-update-key Fixed Show fixed Hide fixed
@liulinC liulinC force-pushed the private/linl/dev branch 4 times, most recently from d73816b to 577a243 Compare March 7, 2024 05:21
Signed-off-by: Lin Liu <lin.liu@citrix.com>
Copy link
Contributor

@edwintorok edwintorok left a comment

Choose a reason for hiding this comment

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

No more version detection, this looks good now.
Please run some automated tests on both XS8 and XS9 to check it works on both.

@liulinC
Copy link
Collaborator Author

liulinC commented Mar 8, 2024

New XenRT:

  • XS8: 3947678
  • XS9: 3947677, Import key succeed. Failed with known issue which will be fixed in another ticket.

@liulinC liulinC merged commit b11f678 into xapi-project:feature/xs9 Mar 8, 2024
21 checks passed
@@ -1,6 +1,9 @@
#!/bin/sh
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be /bin/bash because the script it using bash features and would not work in a Posix shell.

Copy link
Collaborator Author

@liulinC liulinC Mar 8, 2024

Choose a reason for hiding this comment

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

I merged the PR, will fix it up later.
Could you clarify which feature causing that issue? My testing of sh -x looks good.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I was wrong. I assumed ${#keyhash} (for string length) requires bash but it is in Posix.

Copy link

github-actions bot commented Mar 8, 2024

pytype_reporter extracted 50 problem reports from pytype output

.

You can check the results of the job here

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