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

Adding oc binary to bin path for multi stage test infra #3362

Merged
merged 3 commits into from
Jun 23, 2020
Merged

Adding oc binary to bin path for multi stage test infra #3362

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a0e880
Adding oc binary to bin path for multi stage test infra
prietyc123 Jun 16, 2020
4e04f40
Added file permission locally and excluding it from docker file
prietyc123 Jun 17, 2020
a58fe36
Created different dockerfile to avoid master break and proceed with m…
prietyc123 Jun 22, 2020
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
4 changes: 4 additions & 0 deletions openshift-ci/build-root/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ 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/check-oc.sh
View file
Open in desktop
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