File tree Expand file tree Collapse file tree 8 files changed +10
-2
lines changed Expand file tree Collapse file tree 8 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,9 @@ copy_cluster_api_to_mirror() {
1515 # Clean the mirror, but preserve the README file.
1616 rm -rf " ${CLUSTER_API_MIRROR_DIR:? } /*.zip"
1717
18- sync_envtest
18+ if test " ${SKIP_ENVTEST} " ! = y; then
19+ sync_envtest
20+ fi
1921
2022 # Zip every binary in the folder into a single zip file.
2123 zip -j1 " ${CLUSTER_API_MIRROR_DIR} /cluster-api.zip" " ${CLUSTER_API_BIN_DIR} " /*
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ FROM registry.ci.openshift.org/ocp/4.16:hyperkube AS kas
77
88FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
99ARG TAGS="baremetal fipscapable"
10+ ARG SKIP_ENVTEST="y"
1011WORKDIR /go/src/github.com/openshift/installer
1112COPY . .
1213COPY --from=etcd /usr/bin/etcd /usr/bin/etcd
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS
1515# FIPS support is offered via the baremetal-installer image
1616ENV GO_COMPLIANCE_EXCLUDE=".*"
1717ARG TAGS="altinfra"
18- ARG OPENSHIFT_INSTALL_CLUSTER_API=" "
18+ ARG SKIP_ENVTEST="y "
1919WORKDIR /go/src/github.com/openshift/installer
2020COPY . .
2121COPY --from=kas-artifacts /usr/share/openshift/ cluster-api/bin/
Original file line number Diff line number Diff line change @@ -41,6 +41,7 @@ RUN GOOS=linux GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
4141FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS linuxarmbuilder
4242ENV GO_COMPLIANCE_EXCLUDE=".*"
4343ARG TAGS=""
44+ ARG SKIP_ENVTEST="y"
4445WORKDIR /go/src/github.com/openshift/installer
4546COPY . .
4647COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/linux_arm64 terraform/bin/linux_arm64
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS
1010# FIPS support is offered via the baremetal-installer image
1111ENV GO_COMPLIANCE_EXCLUDE=".*"
1212ARG TAGS=""
13+ ARG SKIP_ENVTEST="y"
1314WORKDIR /go/src/github.com/openshift/installer
1415COPY . .
1516COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS
1111# FIPS support is offered via the baremetal-installer image
1212ENV GO_COMPLIANCE_EXCLUDE=".*"
1313ARG TAGS=""
14+ ARG SKIP_ENVTEST="y"
1415WORKDIR /go/src/github.com/openshift/installer
1516COPY . .
1617COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ FROM registry.ci.openshift.org/ocp/4.16:hyperkube AS kas
88
99FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
1010ARG TAGS="libvirt fipscapable"
11+ ARG SKIP_ENVTEST="y"
1112WORKDIR /go/src/github.com/openshift/installer
1213COPY . .
1314COPY --from=etcd /usr/bin/etcd /usr/bin/etcd
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS
99# FIPS support is offered via the baremetal-installer image
1010ENV GO_COMPLIANCE_EXCLUDE=".*"
1111ARG TAGS=""
12+ ARG SKIP_ENVTEST="y"
1213WORKDIR /go/src/github.com/openshift/installer
1314COPY . .
1415COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
You can’t perform that action at this time.
0 commit comments