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

Move built rpms to build/packages #863

Merged
merged 1 commit into from
Mar 19, 2020
Merged

Conversation

zmrow
Copy link
Contributor

@zmrow zmrow commented Mar 18, 2020

Issue number:
Fixes #781

Description of changes:

  • Added a new buildsys environment variable for the /build/packages directory
  • Update buildsys to use said directory
  • Update the Dockerfile to take advantage of said directory
  • Updated Makefile.toml's setup and clean targets

Testing done:

  • cargo make's output is correct
$ tree build/        
build/                                                          
├── bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-boot.ext4.lz4
├── bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-data.img.lz4
├── bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty.img.lz4 
├── bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-migrations.tar
├── bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-root.ext4.lz4
├── bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-root.verity.lz4
├── latest                                                         
│   ├── bottlerocket-aws-k8s-1.15-x86_64-boot.ext4.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-boot.ext4.lz4
│   ├── bottlerocket-aws-k8s-1.15-x86_64-data.img.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-data.img.lz4
│   ├── bottlerocket-aws-k8s-1.15-x86_64.img.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty.img.lz4
│   ├── bottlerocket-aws-k8s-1.15-x86_64-migrations.tar -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-migrations.tar
│   ├── bottlerocket-aws-k8s-1.15-x86_64-root.ext4.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-root.ext4.lz4
│   └── bottlerocket-aws-k8s-1.15-x86_64-root.verity.lz4 -> ../bottlerocket-aws-k8s-1.15-x86_64-0.3.1-00851b0-dirty-root.verity.lz4
└── packages
    ├── 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
    ├── bottlerocket-x86_64-apiclient-0.0-0.x86_64.rpm
    ├── bottlerocket-x86_64-apiclient-debuginfo-0.0-0.x86_64.rpm
    ├── bottlerocket-x86_64-apiserver-0.0-0.x86_64.rpm
    ├── bottlerocket-x86_64-apiserver-debuginfo-0.0-0.x86_64.rpm
    ├── bottlerocket-x86_64-audit-2.8.5-1.x86_64.rpm
    ├── bottlerocket-x86_64-audit-debuginfo-2.8.5-1.x86_64.rpm
...
  • cargo make clean cleans up
$ tree build/
build/
└── packages
  • Images run correctly with qemu and AMIs boot and join my cluster.

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 March 18, 2020 14:49
@@ -78,16 +80,20 @@ impl VariantBuilder {
version_image = version_image,
version_build = version_build,
);
let tag = format!("buildsys-var-{variant}-{arch}", variant = variant, arch = arch);
let tag = format!(
Copy link
Contributor Author

Choose a reason for hiding this comment

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

rustfmt changed this formatting, there aren't any actual changes here.

Makefile.toml Outdated Show resolved Hide resolved
@zmrow
Copy link
Contributor Author

zmrow commented Mar 18, 2020

Addresses @tjkirch 's comment

@bcressey
Copy link
Contributor

📦

@zmrow zmrow merged commit 32a43f5 into bottlerocket-os:develop Mar 19, 2020
@zmrow zmrow deleted the packages-dir branch March 19, 2020 20:09
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.

Relocate RPMs into build/packages
3 participants