Skip to content

Commit

Permalink
Adding oc binary to bin path for multi stage test infra (#3362)
Browse files Browse the repository at this point in the history
* Adding oc binary to bin path for multi stage test infra

* Added file permission locally and excluding it from docker file

* Created different dockerfile to avoid master break and proceed with multistage changes
  • Loading branch information
prietyc123 committed Jun 23, 2020
1 parent e28812a commit 4b29931
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
10 changes: 10 additions & 0 deletions openshift-ci/build-root/multistage/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Dockerfile to bootstrap build and test in openshift-ci

FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12

RUN yum -y install make wget gcc git httpd-tools

# This is a temporary change to make sure that it should run on both template based as well as multi-stage test
# will remove this change once we completely migrate to multi-stage test infra
COPY openshift-ci/build-root/check-oc.sh .
RUN ./check-oc.sh
10 changes: 10 additions & 0 deletions openshift-ci/build-root/multistage/check-oc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -x

## Constants
OC_BINARY="./oc"

# Copy oc binary to bin path
if [ -f $OC_BINARY ]; then
cp ./oc /usr/bin/oc
fi

0 comments on commit 4b29931

Please sign in to comment.