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.

Sign up for GitHub

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

Jump to bottom

rename relocatable packages #10891

Closed
wants to merge 1 commit into from
Closed

rename relocatable packages #10891

wants to merge 1 commit into from

Conversation

syuu1228
Copy link
Contributor

@syuu1228 syuu1228 commented Jun 27, 2022 •
edited
Loading

Currently, we use following naming convention for relocatable package
filename:
${package_name}-${arch}-package-${version}.${release}.tar.gz
But this is very different with Linux standard packaging system such as
.rpm and .deb.
Let's align the convention to .rpm style, so new convention should be:
${package_name}-${version}-${release}.${arch}.tar.gz

Closes #9799

@syuu1228
Copy link
Contributor Author

Note that this PR requires to merge following submodule PRs before merging:
scylladb/scylla-tools-java#300
scylladb/scylla-python3#29
scylladb/scylla-jmx#185

@syuu1228 syuu1228 requested a review from avikivity June 27, 2022 06:20
@scylladb-promoter
Copy link
Contributor

CI state FAILURE - https://jenkins.scylladb.com/job/releng/job/Scylla-CI/1056/

@scylladb-promoter
Copy link
Contributor

CI state SUCCESS - https://jenkins.scylladb.com/job/releng/job/Scylla-CI/1057/

@syuu1228
Copy link
Contributor Author

syuu1228 commented Jul 4, 2022

@avikivity ping

@avikivity
Copy link
Member

This will break the release engineering pipeline, if it expects the old names.

@syuu1228
Copy link
Contributor Author

This will break the release engineering pipeline, if it expects the old names.

Well, it keeps older names by "-compat" target.
Currently, we use "arch" included file name: {scylla_product}-python3-{arch}-package.tar.gz
And we copy it to older file name which does not included "arch" (-compat target): {scylla_product}-python3-package.tar.gz
In this PR, it provides "-compat" target and also "-compat-arch" target, so it provides both {scylla_product}-python3-{arch}-package.tar.gz and {scylla_product}-python3-package.tar.gz.

@yaronkaikov
Copy link
Contributor

@syuu1228 @avikivity Let me verify it before merging , i will prepare a PR to align pkg side

@yaronkaikov
Copy link
Contributor

@syuu1228 Can you please try to build it using https://jenkins.scylladb.com/view/master/job/scylla-master/job/byo/job/byo_build_tests_dtest/ ?

@syuu1228
Copy link
Contributor Author

We tried to build it on byo but it failed at strange error while building AMI, probably unrelated with this PR:

21:28:27  + bash -c 'set -o pipefail; /jenkins/workspace/scylla-master/byo/byo_build_tests_dtest/scylla-pkg/tools/packaging/dpackager -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -- ./build_deb_ami.sh --product scylla --repo downloads.scylladb.com/testing/unstable/scylla/master/deb/unified/byo/2022-07-17T14:28:30Z/scylladb-master/scylla.list --log-file ami_x86_64.log --debug   --build-id 1484 --operating-system ubuntu-20.04 --build-tag jenkins-scylla-master-byo-byo_build_tests_dtest-1484 --branch null --scylla-build-sha-id null '
21:28:27  5.1.dev-20220717.c7c238e
21:28:27  --product parameter: PRODUCT |scylla|
21:28:27  --repo parameter: REPO_FOR_INSTALL downloads.scylladb.com/testing/unstable/scylla/master/deb/unified/byo/2022-07-17T14:28:30Z/scylladb-master/scylla.list
21:28:27  --log-file parameter: PACKER_LOG_PATH |ami_x86_64.log|
21:28:27  !!! Building image for debug !!!
21:28:27  --build-id parameter: BUILD_ID |1484|
21:28:27  --operating-system parameter: OPERATING_SYSTEM |ubuntu-20.04|
21:28:27  --build-tag parameter: BUILD_TAG |jenkins-scylla-master-byo-byo_build_tests_dtest-1484|
21:28:27  --branch parameter: BRANCH |null|
21:28:27  --build-id parameter: SCYLLA_BUILD_SHA_ID |null|
21:28:27  INSTALL_ARGS: | --repo downloads.scylladb.com/testing/unstable/scylla/master/deb/unified/byo/2022-07-17T14:28:30Z/scylladb-master/scylla.list --product scylla|
21:28:28    % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
21:28:28                                   Dload  Upload   Total   Spent    Left  Speed
21:28:28  
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0Warning: Failed to create the file 
21:28:28  Warning: /etc/apt/sources.list.d/tmp.OdFR1Jtg7P.list: No such file or 
21:28:28  Warning: directory
21:28:28  
100   143  100   143    0     0   1643      0 --:--:-- --:--:-- --:--:--  1643
21:28:28  curl: (23) Failure writing output to destination

see: https://jenkins.scylladb.com/view/master/job/scylla-master/job/byo/job/byo_build_tests_dtest/1484/console

Since it's probably not a bug of this patch, I relaunched the jenkins job:
https://jenkins.scylladb.com/view/master/job/scylla-master/job/byo/job/byo_build_tests_dtest/1486/

yaronkaikov
yaronkaikov approved these changes Jul 18, 2022
View reviewed changes
Copy link
Contributor

@yaronkaikov yaronkaikov left a comment

Choose a reason for hiding this comment

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

@syuu1228 Looks like pkg side is good to go, tested this on byo centos and unified-deb gce' 'azure' and 'ami all passed

LGTM

@syuu1228
rename relocatable packages
e9dfa18 
Currently, we use following naming convention for relocatable package
filename:
  ${package_name}-${arch}-package-${version}.${release}.tar.gz
But this is very different with Linux standard packaging system such as
.rpm and .deb.
Let's align the convention to .rpm style, so new convention should be:
  ${package_name}-${version}-${release}.${arch}.tar.gz

Closes scylladb#9799
@syuu1228
Copy link
Contributor Author

Rebased with latest master, since configure.py was conflicted with pip symlinks change.

@syuu1228
Copy link
Contributor Author

As I described on above, when we merge this please merge submodule PRs first, otherwise we will get build error.

@scylladb-promoter
Copy link
Contributor

CI state FAILURE - https://jenkins.scylladb.com/job/releng/job/Scylla-CI/1402/

This was referenced Jul 18, 2022
Closed
Closed
Closed
@avikivity
Copy link
Member

Is releng ready for this? If I merge all the relevant patches, will everything work, or is something else needed from releng?

@yaronkaikov
Copy link
Contributor

@avikivity It will work..

avikivity pushed a commit that referenced this pull request Jul 19, 2022
@syuu1228 @avikivity
rename relocatable packages
876a423 
Currently, we use following naming convention for relocatable package
filename:
  ${package_name}-${arch}-package-${version}.${release}.tar.gz
But this is very different with Linux standard packaging system such as
.rpm and .deb.
Let's align the convention to .rpm style, so new convention should be:
  ${package_name}-${version}-${release}.${arch}.tar.gz

Closes #9799

Closes #10891
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yaronkaikov yaronkaikov yaronkaikov approved these changes

@avikivity avikivity Awaiting requested review from avikivity

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

reloc: rename the package to align arch convention
4 participants
@syuu1228 @scylladb-promoter @avikivity @yaronkaikov