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

CASMINST-6406 #2695

Merged
merged 1 commit into from
Aug 18, 2023
Merged

CASMINST-6406 #2695

merged 1 commit into from
Aug 18, 2023

Conversation

rustydb
Copy link
Contributor

@rustydb rustydb commented Aug 11, 2023

This cleans up the root of the tarball, moving loose files into suitable directories.

  • /install.deps-*.packages* is removed
  • /tds_cpu_requests.yaml is renamed and moved into /lib/
  • /pre-install-toolkit*.iso* moved into /images/pre-install-toolkit
  • /hpe-signing-key.asc moved into /security/

Before and after, using the csm-1.5.0-beta.34 tarball as an example.

ncn-m001:/etc/cray/upgrade/csm/csm-1.5.0-beta.34/tarball/csm-1.5.0-beta.34 # ll							ncn-m001:/etc/cray/upgrade/csm/csm-1.5.0-beta.34/tarball/csm-1.5.0-beta.34 # ll
total 3278081															total 3278081
-rw-r--r--  1 root root      84524 Aug  9 20:57 CHANGELOG.md									-rw-r--r--  1 root root      84524 Aug  9 20:57 CHANGELOG.md
drwxr-xr-x  5 root root          3 Aug  9 21:11 docker										drwxr-xr-x  5 root root          3 Aug  9 21:11 docker
drwxr-xr-x 12 root root         14 Aug  9 21:11 docs										drwxr-xr-x 12 root root         14 Aug  9 21:11 docs
drwxr-xr-x  2 root root          1 Aug  9 21:09 hack										drwxr-xr-x  2 root root          1 Aug  9 21:09 hack
drwxr-xr-x  2 root root         91 Aug  9 21:09 helm										drwxr-xr-x  2 root root         91 Aug  9 21:09 helm
-rw-r--r--  1 root root       2121 May  5  2021 hpe-signing-key.asc							    <
drwxr-xr-x  5 root root          3 Aug  9 21:14 images										drwxr-xr-x  5 root root          3 Aug  9 21:14 images
-rw-r--r--  1 root root        408 Aug  9 20:57 INSTALL										-rw-r--r--  1 root root        408 Aug  9 20:57 INSTALL
-rw-r--r--  1 root root      24407 Aug  8 16:50 installed.deps-5.2.2-x86_64.packages					    <
-rw-r--r--  1 root root         65 Aug  9 21:12 installed.deps-5.2.2-x86_64.packages.sha256.txt				    <
-rwxr-xr-x  1 root root       4709 Aug  9 20:57 install.sh									-rwxr-xr-x  1 root root       4709 Aug  9 20:57 install.sh
drwxr-xr-x  2 root root          7 Aug  9 21:09 lib										drwxr-xr-x  2 root root          7 Aug  9 21:09 lib
drwxr-xr-x  2 root root          8 Aug  9 21:09 manifests									drwxr-xr-x  2 root root          8 Aug  9 21:09 manifests
-rw-r--r--  1 root root         58 Aug  9 21:09 nexus-blobstores.yaml								-rw-r--r--  1 root root         58 Aug  9 21:09 nexus-blobstores.yaml
-rw-r--r--  1 root root       2582 Aug  9 21:09 nexus-repositories.yaml								-rw-r--r--  1 root root       2582 Aug  9 21:09 nexus-repositories.yaml
-rw-r--r--  1 root root 3356622848 Aug  8 16:50 pre-install-toolkit-5.2.2-x86_64.iso					    <
-rw-r--r--  1 root root         65 Aug  9 21:12 pre-install-toolkit-5.2.2-x86_64.iso.sha256.txt				    <
-rw-r--r--  1 root root       1463 Aug  9 20:57 README										-rw-r--r--  1 root root       1463 Aug  9 20:57 README
drwxr-xr-x  4 root root          4 Aug 10 20:36 rpm										drwxr-xr-x  4 root root          4 Aug 10 20:36 rpm
drwxr-xr-x  3 root root          1 Aug  9 21:18 scans										drwxr-xr-x  3 root root          1 Aug  9 21:18 scans
drwxr-xr-x  7 root root          7 Aug  9 21:09 shasta-cfg									drwxr-xr-x  7 root root          7 Aug  9 21:09 shasta-cfg
-rw-r--r--  1 root root       1579 Aug  9 21:09 tds_cpu_requests.yaml							    <
-rwxr-xr-x  1 root root       5653 Aug  9 20:57 upgrade.sh									-rwxr-xr-x  1 root root       5653 Aug  9 20:57 upgrade.sh
drwxr-xr-x  2 root root          2 Aug  9 21:17 vendor										drwxr-xr-x  2 root root          2 Aug  9 21:17 vendor
drwxr-xr-x 10 root root          8 Aug  9 21:11 workarounds									drwxr-xr-x 10 root root          8 Aug  9 21:11 workarounds

@rustydb rustydb requested a review from a team as a code owner August 11, 2023 15:43
assets.sh Show resolved Hide resolved
release.sh Show resolved Hide resolved
@rustydb
Copy link
Contributor Author

rustydb commented Aug 11, 2023

I'll make a backport to 1.6 once reviews settle.

Copy link
Contributor

@mtupitsyn mtupitsyn left a comment

Choose a reason for hiding this comment

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

Needs backport to release/1.6?

Copy link
Contributor

@mtupitsyn mtupitsyn left a comment

Choose a reason for hiding this comment

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

It looks like make -C images is not happy about having tds-cpu-requests.yaml under manifests/:

[2023-08-11T15:45:12.634Z] jq: error (at <stdin>:1): Cannot iterate over null (null)
[2023-08-11T15:45:12.891Z] ...Successfully got an update from the "csm-algol60" chart repository
[2023-08-11T15:45:12.891Z] bash: line 1: kill: (-2637) - No such process
[2023-08-11T15:45:12.891Z] make[1]: *** [Makefile:26: manifests/tds-cpu-requests.txt] Error 1

https://jenkins.algol60.net/job/Cray-HPE/job/csm/job/CASMINST-6406/1/display/redirect

This cleans up the root of the tarball, moving loose files into suitable
directories.

- `/install.deps-*.packages*` is removed
- `/tds_cpu_requests.yaml` is renamed and moved into `/lib/`
- `/pre-install-toolkit*.iso*` moved into `/images/pre-install-toolkit`
- `/hpe-signing-key.asc` moved into `/security/`
@rustydb
Copy link
Contributor Author

rustydb commented Aug 18, 2023

/backport release/1.6

@github-actions github-actions bot mentioned this pull request Aug 18, 2023
@github-actions
Copy link

Backporting into branch release/1.6 was successful. New PR: #2727

@mtupitsyn mtupitsyn merged commit d543b1e into release/1.5 Aug 18, 2023
2 checks passed
@mtupitsyn mtupitsyn deleted the CASMINST-6406 branch August 18, 2023 17:32
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.

2 participants