Skip to content

Commit c007841

Browse files
committed
Adding support for Openshift CI
1 parent c8e17ce commit c007841

File tree

6 files changed

+27
-4
lines changed

6 files changed

+27
-4
lines changed

OWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
approvers:
2+
- jupierce
3+
- bradmwilliams
4+
reviewers:
5+
- jupierce
6+
- bradmwilliams

ansible/roles/openshift_client_python/library/openshift_client_python.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doctoc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22

3-
doctoc --github readme.md
3+
doctoc --github README.md
44

images/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM registry.ci.openshift.org/ocp/4.12:cli as cli
2+
3+
FROM registry.ci.openshift.org/origin/centos:stream8
4+
LABEL maintainer="brawilli@redhat.com"
5+
6+
COPY --from=cli /usr/bin/oc /usr/bin/
7+
8+
ADD . /openshift-client-python
9+
10+
RUN yum install -y python2 python3 git && python2 -m pip install --upgrade pip && python2 -m pip install -r /openshift-client-python/requirements.txt && python3 -m pip install --upgrade pip && python3 -m pip install -r /openshift-client-python/requirements.txt
11+
12+
ENV PYTHONPATH=/openshift-client-python/packages:$PYTHONPATH
13+
ENV PYTHONUNBUFFERED=1
14+
15+
ENTRYPOINT /usr/bin/bash

run_unittests.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
22

3-
export PYTHONPATH="$(pwd)/packages"
4-
cd $(pwd)/packages
3+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]:-$0}")
4+
5+
export PYTHONPATH="${SCRIPT_ROOT}/packages"
6+
cd ${SCRIPT_ROOT}/packages
57
python2 -m unittest discover
68
python3 -m unittest discover

0 commit comments

Comments
 (0)