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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Aug 14, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions group.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ urls:
insecure_source: true

branch: rhaos-{MAJOR}.{MINOR}-rhel-9
default_image_build_method: osbs2

repos:
rhel-9-golang-rpms:
Expand Down
4 changes: 4 additions & 0 deletions images/openshift-golang-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,7 @@ RUN [ $(go env GOARCH) != "amd64" ] || (\

# above is conditional; clean up unconditionally
RUN rm -f cross.tar.gz && yum clean all -y

# FOD wrapper modification
COPY go_wrapper.sh /tmp/go_wrapper.sh
RUN 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
12 changes: 9 additions & 3 deletions images/openshift-golang-builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ content:
branch:
target: rhel-9-golang-1.20
url: [email protected]:openshift/ocp-build-data.git
modifications:
- 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

doozer_source: golang_builder_FIPS_wrapper.sh
path: images/go_wrapper.sh
overwriting: true
enabled_repos:
- rhel-9-server-ose-build-rpms
- rhel-9-baseos-rpms
Expand All @@ -25,8 +30,9 @@ name: openshift/golang-builder
owners:
- [email protected]

additional_tags:
- 'rhel_9_golang_1.20'
- 'rhel_9_1.20'
# Don't add floating tag to FoD builder for now, until we confident CPASS can use it
# additional_tags:
# - 'rhel_9_golang_1.20'
# - 'rhel_9_1.20'
maintainer:
component: Release