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

Rename built artifacts (variant-arch-version) #776

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Conversation

zmrow
Copy link
Contributor

@zmrow zmrow commented Feb 25, 2020

Issue number:
N/A

Description of changes:
Previously, all built artifacts were named as such:
bottlerocket-$ARCH-$VARIANT-$VERSION-$COMMIT.extension

This commit moves the $VARIANT first to better line up with
names elsewhere in the project:
bottlerocket-$VARIANT-$ARCH-VERSION-$COMMIT.extension

Testing done:

  • Built and successfully booted an AMI which joined my cluster

Images:

[mrowicki@ip-10-0-60-75 bottlerocket]$ ls -lah build/*img*
-rw-r--r--. 1 mrowicki mrowicki 1.0G Feb 25 22:07 build/bottlerocket-aws-k8s-x86_64-0.2.2-be373338-data.img
-rw-r--r--. 1 mrowicki mrowicki 4.1M Feb 25 22:07 build/bottlerocket-aws-k8s-x86_64-0.2.2-be373338-data.img.lz4
-rw-r--r--. 1 mrowicki mrowicki 2.0G Feb 25 22:07 build/bottlerocket-aws-k8s-x86_64-0.2.2-be373338.img
-rw-r--r--. 1 mrowicki mrowicki 273M Feb 25 22:07 build/bottlerocket-aws-k8s-x86_64-0.2.2-be373338.img.lz4

Migrations

[mrowicki@ip-10-0-60-75 bottlerocket]$ ls -lah build/*migrations*
-rw-r--r--. 1 mrowicki mrowicki 2.3M Feb 25 22:07 build/bottlerocket-aws-k8s-x86_64-0.2.2-be373338-migrations.tar
-rw-r--r--. 1 mrowicki mrowicki 596K Feb 25 21:44 build/bottlerocket-x86_64-migrations-0.0-0.x86_64.rpm
-rw-r--r--. 1 mrowicki mrowicki 6.5M Feb 25 21:45 build/bottlerocket-x86_64-migrations-debuginfo-0.0-0.x86_64.rpm

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Makefile.toml Show resolved Hide resolved
INSTALL.md Show resolved Hide resolved
@bcressey
Copy link
Contributor

Separate cleanup ask: can we relocate RPMs into build/packages and images and migrations into build/variants ?

It's jarring to see the two conventions side by side and the RPM naming convention is much harder to change.

@tjkirch
Copy link
Contributor

tjkirch commented Feb 26, 2020

Separate cleanup ask: can we relocate RPMs into build/packages and images and migrations into build/variants ?

What if images (and migrations) remained in the main build directory? They're the primary output.

[edit] or at least call the directory "images"? :)

@zmrow
Copy link
Contributor Author

zmrow commented Feb 26, 2020

I like images/migrations in the /build directory and RPMs in build/packages

Previously built artifacts were named as such:
bottlerocket-$ARCH-$VARIANT-$VERSION-$COMMIT.extension

This commit moves the $VARIANT first to better line up with
names elsewhere in the project:
bottlerocket-$VARIANT-$ARCH-VERSION-$COMMIT.extension
@zmrow
Copy link
Contributor Author

zmrow commented Feb 26, 2020

Addressed comments from @tjkirch

@zmrow zmrow merged commit 179eac9 into develop Feb 26, 2020
@zmrow zmrow deleted the rename-artifacts branch February 26, 2020 20:33
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.

None yet

3 participants