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

[ART-7273] add modifications to support go wrapper #3309

Conversation

Ximinhan
Copy link

@Ximinhan Ximinhan commented Aug 2, 2023

add go wrapper during golang build process, the wrapper script will get from doozer repo

@Ximinhan Ximinhan changed the title add modifications to support go wrapper [ART-7273] add modifications to support go wrapper Aug 2, 2023
@Ximinhan Ximinhan changed the title [ART-7273] add modifications to support go wrapper [WIP][ART-7273] add modifications to support go wrapper Aug 2, 2023
modifications:
- action: replace
match: "# FOD wrapper modification"
replacement: "COPY go_wrapper.sh /tmp/go_wrapper.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

I think I'd rather see this script in Dockerfile directly, than the comment to be used as a replacement placeholder.

Copy link
Author

Choose a reason for hiding this comment

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

ok, seem directly hack in dockerfile is straightforward

match: "# FOD wrapper modification"
replacement: "COPY go_wrapper.sh /tmp/go_wrapper.sh
RUN /bin/bash -c 'GO_BIN_PATH=`which go`; mv $GO_BIN_PATH $GO_BIN_PATH.real; mv /tmp/go_wrapper.sh $GO_BIN_PATH; chmod +x $GO_BIN_PATH'"
- action: add
Copy link
Contributor

Choose a reason for hiding this comment

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

doozer is running the rebase code, so would have access to the shell file of the current commit. Think it'd be nicer to not add a network call to master, but to load the file while rebasing.

Copy link
Author

Choose a reason for hiding this comment

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

the way to use modification method is trying to not add extra logic in images:rebase. I tried to no using URL but that seems the only pattern that ADD modification support. Unless we try to add relative path for add modification function in doozer, I added openshift-eng/doozer@253992d

@Ximinhan Ximinhan changed the title [WIP][ART-7273] add modifications to support go wrapper [ART-7273] add modifications to support go wrapper Aug 11, 2023
@joepvd
Copy link
Contributor

joepvd commented Aug 11, 2023

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2023
@Ximinhan
Copy link
Author

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: #3309 (comment)

bug in ci ?

@Ximinhan
Copy link
Author

oh, there are no owners file in this branch https://github.com/openshift-eng/ocp-build-data/blob/rhel-9-golang-1.20/OWNERS

@joepvd joepvd added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 14, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: joepvd

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:

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

@openshift-merge-robot openshift-merge-robot merged commit cdaafde into openshift-eng:rhel-9-golang-1.20 Aug 14, 2023
1 check passed
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.

None yet

3 participants