search

openshift / router

Ingress controller for OpenShift
Apache License 2.0
68 stars 114 forks source link

OCPBUGS-38475: Rename router Dockerfiles #616

Closed grzpiotrowski closed 1 month ago

grzpiotrowski commented 1 month ago

In an effort to fix the discrepancy between the Dockerfile names and their contents which refer to rhel9 Renamed Dockerfiles:

which both are names independent of the version.

Coordinated with:

openshift-ci[bot] commented 1 month ago

Skipping CI for Draft Pull Request. If you want CI signal for your change, please convert it to an actual PR. You can still manually trigger a test run with /test all

openshift-ci-robot commented 1 month ago

@grzpiotrowski: This pull request references Jira Issue OCPBUGS-38475, 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.18.0) matches configured target version for branch (4.18.0) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @melvinjoseph86

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

In response to [this](https://github.com/openshift/router/pull/616): >In an effort to fix the discrepancy between the Dockerfile names and their contents which refer to rhel9 >Renamed Dockerfiles: >- from images/router/base/`Dockerfile.rhel` to images/router/base/`Dockerfile.ocp` >- from images/router/haproxy/`Dockerfile.rhel8` to images/router/haproxy/`Dockerfile.ocp` > >which both are names independent of the version. > >To be coordinated with: >- merging the PR https://github.com/openshift/release/pull/55354 >- ART opening a PR to update in [images/ose-haproxy-router-base.yml](https://github.com/openshift-eng/ocp-build-data/blob/openshift-4.17/images/ose-haproxy-router-base.yml#L4) and [images/openshift-enterprise-haproxy-router.yml](https://github.com/openshift-eng/ocp-build-data/blob/openshift-4.17/images/openshift-enterprise-haproxy-router.yml#L3) once this PR is ready. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Frouter). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
candita commented 1 month ago

/assign @alebedev87

grzpiotrowski commented 1 month ago

/retest

https://github.com/openshift/release/pull/55354 merged, expecting tests to pass now.

alebedev87 commented 1 month ago

/lgtm /approve

grzpiotrowski commented 1 month ago

Sorry, I noticed it a little late. Can you add the bug reference to the commit message too?

Thank you. Bug reference added to the commit message now.

alebedev87 commented 1 month ago

@grzpiotrowski : Thank you!

/lgtm /approve

openshift-ci[bot] commented 1 month ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alebedev87

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

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/router/blob/master/OWNERS)~~ [alebedev87] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci-robot commented 1 month ago

@grzpiotrowski: This pull request references Jira Issue OCPBUGS-38475, 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 @melvinjoseph86

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

In response to [this](https://github.com/openshift/router/pull/616): >In an effort to fix the discrepancy between the Dockerfile names and their contents which refer to rhel9 >Renamed Dockerfiles: >- from images/router/base/`Dockerfile.rhel` to images/router/base/`Dockerfile.ocp` >- from images/router/haproxy/`Dockerfile.rhel8` to images/router/haproxy/`Dockerfile.ocp` > >which both are names independent of the version. > >To be coordinated with: >- merging the PR https://github.com/openshift/release/pull/55354 >- ART opening a PR to update in [images/ose-haproxy-router-base.yml](https://github.com/openshift-eng/ocp-build-data/blob/openshift-4.18/images/ose-haproxy-router-base.yml#L4) and [images/openshift-enterprise-haproxy-router.yml](https://github.com/openshift-eng/ocp-build-data/blob/openshift-4.18/images/openshift-enterprise-haproxy-router.yml#L3) once this PR is ready. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Frouter). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
ashwindasr commented 1 month ago

/hold

Once all tests pass, I'll unhold so that we can get this and the coredns one in around the same time. Followed by https://github.com/openshift-eng/ocp-build-data/pull/5265

grzpiotrowski commented 1 month ago

/retest e2e-agnostic

openshift-ci[bot] commented 1 month ago

@grzpiotrowski: The /retest command does not accept any targets. The following commands are available to trigger required jobs:

The following commands are available to trigger optional jobs:

Use /test all to run the following jobs that were automatically triggered:

In response to [this](https://github.com/openshift/router/pull/616#issuecomment-2293932147): >/retest e2e-agnostic Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
grzpiotrowski commented 1 month ago

/test e2e-agnostic

openshift-ci[bot] commented 1 month ago

@grzpiotrowski: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
ashwindasr commented 1 month ago

/unhold

openshift-ci-robot commented 1 month ago

@grzpiotrowski: Jira Issue OCPBUGS-38475: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-38475 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/router/pull/616): >In an effort to fix the discrepancy between the Dockerfile names and their contents which refer to rhel9 >Renamed Dockerfiles: >- from images/router/base/`Dockerfile.rhel` to images/router/base/`Dockerfile.ocp` >- from images/router/haproxy/`Dockerfile.rhel8` to images/router/haproxy/`Dockerfile.ocp` > >which both are names independent of the version. > >Coordinated with: >- merging the PR https://github.com/openshift/release/pull/55354 first. >- ART merging https://github.com/openshift-eng/ocp-build-data/pull/5265 once this is merged. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Frouter). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-bot commented 1 month ago

[ART PR BUILD NOTIFIER]

Distgit: ose-haproxy-router-base This PR has been included in build ose-haproxy-router-base-container-v4.18.0-202408162347.p0.g47b8420.assembly.stream.el9. All builds following this will include this PR.

openshift-bot commented 1 month ago

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-haproxy-router This PR has been included in build openshift-enterprise-haproxy-router-container-v4.18.0-202408162347.p0.g47b8420.assembly.stream.el9. All builds following this will include this PR.