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

OCPBUGS-36630: Add hack Makefile target to build CI version of router image #612

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

alebedev87
Copy link
Contributor

@alebedev87 alebedev87 commented Jul 3, 2024

This PR enables the build of the CI version router image on local. The same base and router dockerfiles are used by the new target. Use case: I want the same image that the CI would build but with my fix.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 3, 2024
@openshift-ci-robot
Copy link
Contributor

@alebedev87: This pull request explicitly references no jira issue.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from frobware and Miciah July 3, 2024 09:18
Copy link
Contributor

openshift-ci bot commented Jul 3, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from alebedev87. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@alebedev87 alebedev87 force-pushed the hack-new-ci-router-image branch from 628d504 to 0df56d3 Compare July 3, 2024 09:37
@alebedev87 alebedev87 changed the title NO-JIRA: Add hack Makefile rule to build CI version of router image NO-JIRA: Add hack Makefile target to build CI version of router image Jul 3, 2024
new-ci-router-image:
$(IMAGEBUILDER) build -t $(IMAGE_BASE):$(TAG) -f images/router/base/Dockerfile.rhel .
cp -f images/router/haproxy/Dockerfile.rhel8 images/router/haproxy/Dockerfile.rhel8.debug
sed -i "s|FROM .*|FROM $(IMAGE_BASE):$(TAG)|" images/router/haproxy/Dockerfile.rhel8.debug
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use dockerfile build args https://docs.docker.com/build/guide/build-args/? You can apply default arguments.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't want to touch the existing dockerfiles in any way just for a hack command. But let's give it a shot and see if the CI passes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The rebase conflict I'm having on this PR is due to the ART automation which updates images/router/haproxy/Dockerfile.rhel8's FROM. The ARG may be preventing this automation from working smoothly.

@alebedev87 alebedev87 force-pushed the hack-new-ci-router-image branch from eb1034e to 08421d1 Compare July 5, 2024 15:00
@alebedev87 alebedev87 changed the title NO-JIRA: Add hack Makefile target to build CI version of router image OCPBUGS-36630: Add hack Makefile target to build CI version of router image Jul 5, 2024
@openshift-ci-robot openshift-ci-robot added the jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. label Jul 5, 2024
@openshift-ci-robot
Copy link
Contributor

@alebedev87: This pull request references Jira Issue OCPBUGS-36630, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This PR enables the build of the CI version router image on local. The same base and router dockerfiles are used by the new target. Use case: I want the same image that the CI would build but with my fix.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 5, 2024
@openshift-ci openshift-ci bot requested a review from lihongan July 5, 2024 15:01
@ShudiLi
Copy link
Member

ShudiLi commented Jul 10, 2024

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@ShudiLi: This pull request references Jira Issue OCPBUGS-36630, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from ShudiLi July 10, 2024 05:41
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 10, 2024
@rfredette
Copy link
Contributor

/assign

@grzpiotrowski
Copy link
Contributor

Since this touches the hacks, I wanted to throw in a little change to propose alongside. Please ignore if this shouldn't be included here.

In HACKING.md: lines 28-29 describe theDockerfile.debug file and state that:

(...) The outputted image uses `centos:8` as it's base
since installing packages on an OpenShift RHEL base image requires RHEL entitlements.

but ubi9 is actually used as the base image there instead. This mention of centos:8 could be deleted then?

@alebedev87 alebedev87 force-pushed the hack-new-ci-router-image branch from 08421d1 to 02bbc8e Compare September 5, 2024 16:11
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 5, 2024
@alebedev87
Copy link
Contributor Author

/retest

@ShudiLi
Copy link
Member

ShudiLi commented Sep 11, 2024

/label qe-approved
thanks

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 11, 2024
@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Sep 11, 2024
@openshift-ci-robot
Copy link
Contributor

@alebedev87: This pull request references Jira Issue OCPBUGS-36630, which is invalid:

  • expected the bug to target either version "4.18." or "openshift-4.18.", but it targets "4.17.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

This PR enables the build of the CI version router image on local. The same base and router dockerfiles are used by the new target. Use case: I want the same image that the CI would build but with my fix.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 11, 2024
@alebedev87
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Sep 11, 2024
@openshift-ci-robot
Copy link
Contributor

@alebedev87: This pull request references Jira Issue OCPBUGS-36630, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 11, 2024
@ShudiLi
Copy link
Member

ShudiLi commented Oct 8, 2024

/label qe-approved
thanks

@alebedev87 alebedev87 force-pushed the hack-new-ci-router-image branch from 02bbc8e to a2a6cb5 Compare October 8, 2024 12:12
@alebedev87
Copy link
Contributor Author

Reverted the default image repository to openshift to reduce the diff with #609.

Copy link
Contributor

openshift-ci bot commented Oct 8, 2024

@alebedev87: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants