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

Add a new hotfix image build script #959

Merged
merged 1 commit into from May 5, 2023
Merged

Add a new hotfix image build script #959

merged 1 commit into from May 5, 2023

Conversation

bdunne
Copy link
Member

@bdunne bdunne commented May 4, 2023

  • Build on top of existing images by copying over local RPMs and updating only those RPMs (as we would do in a hotfix situation between releases)
  • Allow for productized source image names

@bdunne
Add a new hotfix image build script
4d73b32 
- Build on top of existing images by copying over local RPMs and updating
only those RPMs (as we would do in a hotfix situation between releases)
- Allow for productized source image names
Fryguy
Fryguy reviewed May 4, 2023
View reviewed changes
bin/build
BASE_DIR=${BASE_DIR:-$PWD}
CONTAINER_PREFIX=${CONTAINER_PREFIX:-manageiq}
Copy link
Member

@Fryguy Fryguy May 4, 2023 •
edited

Choose a reason for hiding this comment

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

I assume we'll start using this in the future?

I mean for the image names that we loop over

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, but for now we can at least have the same options.

@miq-bot
Copy link
Member

miq-bot commented May 4, 2023

Checked commit bdunne@4d73b32 with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. ⭐

Fryguy
Fryguy reviewed May 5, 2023
View reviewed changes
bin/build
Comment on lines -7 to -9
RPM_BUILD_OPTIONS=${RPM_BUILD_OPTIONS:-""}
RPM_BUILD_IMAGE=${RPM_BUILD_IMAGE:-"manageiq/rpm_build:$TAG"}
RPM_PREFIX=${RPM_PREFIX:-"manageiq"}
Copy link
Member

@Fryguy Fryguy May 5, 2023 •
edited

Choose a reason for hiding this comment

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

I dont't understand removing these as they are used down below in https://github.com/ManageIQ/manageiq-pods/pull/959/files#diff-1fba65931954c73107694f0b7b964148febc5ba35da6812e1e117dfb37436e77R42-R47 and https://github.com/ManageIQ/manageiq-pods/pull/959/files#diff-1fba65931954c73107694f0b7b964148febc5ba35da6812e1e117dfb37436e77R63

Copy link
Member

Choose a reason for hiding this comment

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

That being said I never understood building the RPMs as part of this script - always felt like if that's what's wanted the rpms should be built separately and then passed in.

Copy link
Member

Choose a reason for hiding this comment

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

Additionally downstream builds are using RPM_PREFIX

@Fryguy
Copy link
Member

Fryguy commented May 5, 2023

Merging - will fix any issues in followups

@Fryguy Fryguy merged commit ddb752f into ManageIQ:master May 5, 2023
3 checks passed
@Fryguy
Copy link
Member

Fryguy commented May 5, 2023

Backported to petrosian in commit 0c90723.

commit 0c9072308a5a161cb0185a95ac461445133dd811
Author: Jason Frey <fryguy9@gmail.com>
Date:   Fri May 5 12:03:43 2023 -0400

    Merge pull request #959 from bdunne/add_hotfix_build_script
    
    Add a new hotfix image build script
    
    (cherry picked from commit ddb752fd55af62b9132f979f7964f28cbbb80522)

Fryguy added a commit that referenced this pull request May 5, 2023
@Fryguy
Merge pull request #959 from bdunne/add_hotfix_build_script
0c90723 
Add a new hotfix image build script

(cherry picked from commit ddb752f)
@bdunne bdunne deleted the add_hotfix_build_script branch May 10, 2023 13:04
bdunne pushed a commit to bdunne/manageiq-pods that referenced this pull request May 12, 2023
@Fryguy
Merge pull request ManageIQ#959 from bdunne/add_hotfix_build_script
3c58edd 
Add a new hotfix image build script

(cherry picked from commit ddb752f)
(cherry picked from commit 0c90723)
bdunne added a commit to bdunne/manageiq-pods that referenced this pull request May 15, 2023
@bdunne
Accidentally removed these while rebasing ManageIQ#959
17aa6e8 
They don't belong in build_hotfix, but we need them for a regular build
Fryguy added a commit that referenced this pull request May 15, 2023
@Fryguy
Merge pull request #965 from bdunne/fix_build_script
e939852 
Accidentally removed these while rebasing #959
Fryguy added a commit that referenced this pull request May 16, 2023
@Fryguy
Merge pull request #965 from bdunne/fix_build_script
d9b79de 
Accidentally removed these while rebasing #959

(cherry picked from commit e939852)
@Fryguy Fryguy added this to the Quinteros milestone Sep 14, 2023
@Fryguy Fryguy added this to Petrosian in Roadmap Sep 14, 2023
@Fryguy Fryguy modified the milestones: Quinteros, Petrosian Sep 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fryguy Fryguy Fryguy left review comments

Assignees

@Fryguy Fryguy

Labels
enhancement petrosian/backported
Projects
Roadmap
  
Petrosian
Milestone
Petrosian
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bdunne @miq-bot @Fryguy