Skip to content

[oadp-1.4] Downstream only: Rework of Makefile and incusion of lint#345

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:oadp-1.4from
openshift-cherrypick-robot:cherry-pick-339-to-oadp-1.4
Sep 10, 2024
Merged

[oadp-1.4] Downstream only: Rework of Makefile and incusion of lint#345
openshift-merge-bot[bot] merged 1 commit into
openshift:oadp-1.4from
openshift-cherrypick-robot:cherry-pick-339-to-oadp-1.4

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #339

/assign mpryc

The rework of Makefile to make it more readable and
inclusion of lint as a target as well extract
golangci-lint version from the upstream Dockerfile,
so we test in PROW or locally on the same version as upstream.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Comment thread Makefile.prow
Comment on lines +2 to +3
# podman run -it --rm -v `pwd`:`pwd`:Z -w `pwd` quay.io/konveyor/builder:ubi9-v1.22.2 bash -c "make -f Makefile.prow ci"
# podman run -it --rm -v `pwd`:`pwd`:Z -w `pwd` quay.io/konveyor/builder:ubi9-v1.22.2 bash -c "make -f Makefile.prow lint"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Actually do we wanna use ubi9-latest here?
https://github.com/openshift/velero/blob/oadp-1.4/Dockerfile.ubi#L1

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
# podman run -it --rm -v `pwd`:`pwd`:Z -w `pwd` quay.io/konveyor/builder:ubi9-v1.22.2 bash -c "make -f Makefile.prow ci"
# podman run -it --rm -v `pwd`:`pwd`:Z -w `pwd` quay.io/konveyor/builder:ubi9-v1.22.2 bash -c "make -f Makefile.prow lint"
# podman run -it --rm -v `pwd`:`pwd`:Z -w `pwd` quay.io/konveyor/builder:ubi9-latest bash -c "make -f Makefile.prow ci"
# podman run -it --rm -v `pwd`:`pwd`:Z -w `pwd` quay.io/konveyor/builder:ubi9-latest bash -c "make -f Makefile.prow lint"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

will just leave as is.. for now.

@kaovilai kaovilai added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 5, 2024
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Sep 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: kaovilai, openshift-cherrypick-robot

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

The pull request process is described here

Details 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

@mpryc
Copy link
Copy Markdown

mpryc commented Sep 5, 2024

/retest

1 similar comment
@mpryc
Copy link
Copy Markdown

mpryc commented Sep 10, 2024

/retest

@kaovilai
Copy link
Copy Markdown
Member

/lgtm

@kaovilai kaovilai added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2024
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Sep 10, 2024

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit f6e6228 into openshift:oadp-1.4 Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants