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.

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

Adding documentation for tests #819

Merged
merged 1 commit into from
Oct 26, 2017
Merged

Conversation

ashetty1
Copy link
Contributor

As part of issue #781

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 18, 2017
@surajnarwade
Copy link
Contributor

we have to do make bin first right ?


## Introduction

The functional tests for Kompose on OpenShift cluster leverages oc cluster up` to bring a single-cluster OpenShift instance. The test scripts
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you forgot to add and extra `

it's suppose to be oc cluster up

The functional tests for Kompose on OpenShift cluster leverages oc cluster up` to bring a single-cluster OpenShift instance. The test scripts
are hosted under script/test_in_openshift. The directory structure is as below:

script/test_in_openshift/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put this structure within a ```

- [compose-files/](/script/test_in_openshift/compose-files/) directory contains the docker compose
file used by the test scripts

- The scripts use [`oc cluster up`](https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md) for setting up a single-machine OpenShift cluster. It exits if oc binaries are not installed
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add oc


- The scripts use [`oc cluster up`](https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md) for setting up a single-machine OpenShift cluster. It exits if oc binaries are not installed

- Most of the docker compose files used are the ones already available under [examples/](/examples] or [/script/test/fixtures](/script/test/fixtures).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't add 'most of the docker compose files'

just say Docker Compose examples are available under examples/


## Running OpenShift tests

### Install `oc cluster up`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

random spacing between oc and cluster

@ashetty1 ashetty1 force-pushed the issue_781 branch 2 times, most recently from 078fa87 to dc3f49c Compare October 3, 2017 10:34

## Running OpenShift tests

### Install `oc cluster up`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Random spacing?

Install what though?

I think you mean Deploy oc cluster up


### Install `oc cluster up`

The scripts use [`oc cluster up`](https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md) for setting up a single-machine OpenShift cluster. Installing oc binary is a pre-requisite for running these tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing period at end of sentence.

- [compose-files/](/script/test_in_openshift/compose-files/) directory contains the docker compose
file used by the test scripts

- The scripts use [`oc cluster up`](https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md) for setting up a single-machine OpenShift cluster. It exits if oc binaries are not installed
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing period at end of sentence.


- [tests/](/script/test_in_openshift/tests) directory contains the test scripts

- [compose-files/](/script/test_in_openshift/compose-files/) directory contains the docker compose
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing period at end of sentence.

- [run.sh](/script/test_in_openshift/run.sh) is the master script
which executes all the tests

- [lib.sh](/script/test_in_openshift/lib.sh) consists of helper functions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing period at end of sentence.

└── ..
```

- [run.sh](/script/test_in_openshift/run.sh) is the master script
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing period at end of sentence.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix this @ashetty1 then all good from here 👍 feel free to merge after you've added the period.

## Introduction

The functional tests for Kompose on OpenShift cluster leverages `oc cluster up` to bring a single-cluster OpenShift instance. The test scripts
are hosted under script/test_in_openshift. The directory structure is as below:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove random newline. Or do newline after the script/test_in_openshift sentence.


The scripts use [`oc cluster up`](https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md) for setting up a single-machine OpenShift cluster. Installing oc binary is a pre-requisite for running these tests

Run `make test-openshift` to run the OpenShift tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use make test-openshift to run the OpenShift tests.

@cdrage cdrage merged commit 7cd0635 into kubernetes:master Oct 26, 2017
@cdrage
Copy link
Member

cdrage commented Oct 26, 2017

LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants