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

Use more specific build output directories #948

Merged
merged 2 commits into from
Jun 19, 2020

Conversation

zmrow
Copy link
Contributor

@zmrow zmrow commented Jun 18, 2020

Issue number:
N/A

Description of changes:
Tuftool currently assumes that all files in the supplied directory are targets for the current repo. We're working on tooling that will help automate the release process and we'll need to handle multiple variants and architectures at once. Moving each arch/variant into its own directory will make it easier to find the relevant files.

We also renamed the build/packages directory to build/rpms to distinguish it from the top level packages directory.

Testing done:

  • Build Bottlerocket and everything ends up in the right place!
build/
├── images
│   └── x86_64-aws-k8s-1.15
│       ├── bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirty-boot.ext4.lz4
│       ├── bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirty-data.img.lz4
│       ├── bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirty.img.lz4
│       ├── bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirty-migrations.tar
│       ├── bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirty-root.ext4.lz4
│       ├── bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirty-root.verity.lz4
│       └── latest
│           ├── bottlerocket-aws-k8s-1.15-x86_64-boot.ext4.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dir4
│           ├── bottlerocket-aws-k8s-1.15-x86_64-data.img.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirt4
│           ├── bottlerocket-aws-k8s-1.15-x86_64.img.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dirty.img4
│           ├── bottlerocket-aws-k8s-1.15-x86_64-migrations.tar -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dir
│           ├── bottlerocket-aws-k8s-1.15-x86_64-root.ext4.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-dir4
│           └── bottlerocket-aws-k8s-1.15-x86_64-root.verity.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.4-1ad2043-d4
└── rpms
    ├── bottlerocket-x86_64-acpid-2.0.32-1.x86_64.rpm
    ├── bottlerocket-x86_64-acpid-debuginfo-2.0.32-1.x86_64.rpm
    ├── bottlerocket-x86_64-acpid-debugsource-2.0.32-1.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.

@zmrow zmrow requested review from tjkirch and bcressey June 18, 2020 21:14
@bcressey
Copy link
Contributor

🌲

Copy link
Contributor

@webern webern left a comment

Choose a reason for hiding this comment

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

My precious scriptlets!

@zmrow zmrow merged commit 6a5a06c into bottlerocket-os:develop Jun 19, 2020
@zmrow zmrow deleted the build-directories branch June 19, 2020 20:39
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