search

openshift / assisted-service

Apache License 2.0
109 stars 209 forks source link

NO-ISSUE: Change debug Dockerfile so it will not require prior actions #6674

Closed danmanor closed 1 month ago

danmanor commented 1 month ago

Currently we can't test the debug image in the CI as it requires building the binaries prior to the image building. This PR changes it so it will be done during the image building

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented 1 month ago

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

In response to [this](https://github.com/openshift/assisted-service/pull/6674): > > >## List all the issues related to this PR > >- [ ] New Feature >- [ ] Enhancement >- [ ] Bug fix >- [ ] Tests >- [ ] Documentation >- [ ] CI/CD > >## What environments does this code impact? > >- [ ] Automation (CI, tools, etc) >- [ ] Cloud >- [ ] Operator Managed Deployments >- [x] None > >## How was this code tested? > > > >- [ ] assisted-test-infra environment >- [ ] dev-scripts environment >- [ ] Reviewer's test appreciated >- [ ] Waiting for CI to do a full test run >- [ ] Manual (Elaborate on how it was tested) >- [x] No tests needed > >## Checklist > >- [ ] Title and description added to both, commit and PR. >- [ ] Relevant issues have been associated (see [CONTRIBUTING] guide) >- [ ] This change does not require a documentation update (docstring, `docs`, README, etc) >- [ ] Does this change include unit-tests (note that code changes require unit-tests) > >## Reviewers Checklist > >- Are the title and description (in both PR and commit) meaningful and clear? >- Is there a bug required (and linked) for this change? >- Should this PR be backported? > >[Kubernetes community documentation]: https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#commit-message-guidelines >[CONTRIBUTING]: https://github.com/openshift/assisted-service/blob/master/CONTRIBUTING.md > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-service). 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.
eifrach commented 1 month ago

/lgtm

openshift-ci[bot] commented 1 month ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danmanor

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/assisted-service/blob/master/OWNERS)~~ [danmanor] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
danmanor commented 1 month ago

/override ci/prow/edge-e2e-ai-operator-ztp ci/prow/edge-e2e-metal-assisted ci/prow/edge-subsystem-aws

openshift-ci[bot] commented 1 month ago

@danmanor: 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).
danmanor commented 1 month ago

/cherry-pick release-ocm-2.11

danmanor commented 1 month ago

/cherry-pick release-ocm-2.10

danmanor commented 1 month ago

/cherry-pick release-ocm-2.9

danmanor commented 1 month ago

/cherry-pick release-ocm-2.8

openshift-cherrypick-robot commented 1 month ago

@danmanor: #6674 failed to apply on top of branch "release-ocm-2.11":

Applying: NO-ISSUE: Change debug Dockerfile so it will not require prior actions
Using index info to reconstruct a base tree...
M   Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 NO-ISSUE: Change debug Dockerfile so it will not require prior actions
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/assisted-service/pull/6674#issuecomment-2286779290): >/cherry-pick release-ocm-2.11 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.
openshift-cherrypick-robot commented 1 month ago

@danmanor: #6674 failed to apply on top of branch "release-ocm-2.10":

Applying: NO-ISSUE: Change debug Dockerfile so it will not require prior actions
Using index info to reconstruct a base tree...
M   Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 NO-ISSUE: Change debug Dockerfile so it will not require prior actions
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/assisted-service/pull/6674#issuecomment-2286779469): >/cherry-pick release-ocm-2.10 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.
openshift-cherrypick-robot commented 1 month ago

@danmanor: #6674 failed to apply on top of branch "release-ocm-2.9":

Applying: NO-ISSUE: Change debug Dockerfile so it will not require prior actions
Using index info to reconstruct a base tree...
M   Dockerfile.assisted-service-debug
M   Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging Dockerfile.assisted-service-debug
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 NO-ISSUE: Change debug Dockerfile so it will not require prior actions
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/assisted-service/pull/6674#issuecomment-2286779562): >/cherry-pick release-ocm-2.9 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.
openshift-cherrypick-robot commented 1 month ago

@danmanor: #6674 failed to apply on top of branch "release-ocm-2.8":

Applying: NO-ISSUE: Change debug Dockerfile so it will not require prior actions
Using index info to reconstruct a base tree...
M   Dockerfile.assisted-service-debug
M   Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging Dockerfile.assisted-service-debug
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 NO-ISSUE: Change debug Dockerfile so it will not require prior actions
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/assisted-service/pull/6674#issuecomment-2286779644): >/cherry-pick release-ocm-2.8 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.