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 up to date build_ds_container script in add_platform_rule.py #11042

Merged
merged 1 commit into from
Oct 9, 2023

Conversation

yuumasato
Copy link
Member

@yuumasato yuumasato commented Aug 31, 2023

Description:

  • Switch to the python script.
  • And fix the arguments to build ocp4 and rhcos4.
    Having the '-P' twice caused the script to build only one of the products, the one defined later.

Rationale:

  • utils/build_ds_container.sh is deprecated.

@yuumasato yuumasato requested a review from rhmdnd August 31, 2023 16:30
@github-actions
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@Mab879 Mab879 added the Infrastructure Our content build system label Aug 31, 2023
@@ -277,7 +277,7 @@ def clusterTestFunc(args):
print('* Pushing image build to cluster')
# execute the build_ds_container script
buildp = subprocess.run(
['utils/build_ds_container.sh', '-P', 'ocp4', '-P', 'rhcos4'])
['utils/build_ds_container.py'])
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think the python version still supports passing in different products. Should we maintain that?

Copy link
Member Author

@yuumasato yuumasato Sep 4, 2023

Choose a reason for hiding this comment

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

Yeah, I think we should keep support for different products in build_ds_container.py.

Switch to the python script.
And fix the product arguments, passing '-P' twice was causing it to be reset.
@@ -277,7 +277,7 @@ def clusterTestFunc(args):
print('* Pushing image build to cluster')
# execute the build_ds_container script
buildp = subprocess.run(
['utils/build_ds_container.sh', '-P', 'ocp4', '-P', 'rhcos4'])
['utils/build_ds_container.py', '-P', 'ocp4', 'rhcos4'])
Copy link
Member Author

Choose a reason for hiding this comment

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

I added back explicit specification of the products to build.

But I wonder if we should just build whatever is default in build_ds_container.py.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe this script is OpenShift-specific. I'm OK only building ocp4 and rhcos4 products for now.

@codeclimate
Copy link

codeclimate bot commented Sep 4, 2023

Code Climate has analyzed commit 8a95232 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 53.8% (0.0% change).

View more on Code Climate.

Copy link
Collaborator

@rhmdnd rhmdnd left a comment

Choose a reason for hiding this comment

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

/lgtm

@rhmdnd rhmdnd merged commit d5a041f into ComplianceAsCode:master Oct 9, 2023
37 of 38 checks passed
@yuumasato yuumasato deleted the fix_add_platform_rule branch October 9, 2023 14:14
@yuumasato yuumasato added this to the 0.1.71 milestone Oct 9, 2023
@yuumasato yuumasato assigned yuumasato and rhmdnd and unassigned yuumasato Oct 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Infrastructure Our content build system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants