From f7f6fce068953d8ab7222bd212e1c93108c03afc Mon Sep 17 00:00:00 2001
From: ximhan <ximhan@redhat.com>
Date: Wed, 2 Aug 2023 12:36:27 +0800
Subject: [PATCH] add modifications

---
 group.yml                                  |  1 +
 images/openshift-golang-builder.Dockerfile |  4 ++++
 images/openshift-golang-builder.yml        | 12 +++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/group.yml b/group.yml
index e638e8002b..176d7afa7e 100644
--- a/group.yml
+++ b/group.yml
@@ -19,6 +19,7 @@ urls:
 insecure_source: true
 
 branch: rhaos-{MAJOR}.{MINOR}-rhel-9
+default_image_build_method: osbs2
 
 repos:
   rhel-9-golang-rpms:
diff --git a/images/openshift-golang-builder.Dockerfile b/images/openshift-golang-builder.Dockerfile
index a9beb8fc63..03bdbfd1ab 100644
--- a/images/openshift-golang-builder.Dockerfile
+++ b/images/openshift-golang-builder.Dockerfile
@@ -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
\ No newline at end of file
diff --git a/images/openshift-golang-builder.yml b/images/openshift-golang-builder.yml
index 2c5020e7fe..ac4df2ce86 100644
--- a/images/openshift-golang-builder.yml
+++ b/images/openshift-golang-builder.yml
@@ -7,6 +7,11 @@ content:
       branch:
         target: rhel-9-golang-1.20
       url: git@github.com:openshift/ocp-build-data.git
+    modifications:
+    - action: add
+      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
@@ -25,8 +30,9 @@ name: openshift/golang-builder
 owners:
 - aos-team-art@redhat.com
 
-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