summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve Contribution GuideRodolfo Carvalho2017-04-271-56/+82
| | | | | Update how to submit contributions and how to run tests, reorganizing and expanding the content.
* Replace absolute with relative URLsRodolfo Carvalho2017-04-271-3/+3
| | | | | This makes the links point to the right place in different contexts (e.g., different branches).
* Move repo structure to a separate documentRodolfo Carvalho2017-04-272-55/+55
| | | | Reduces the clutter in CONTRIBUTING.md.
* Remove outdated information about PRsRodolfo Carvalho2017-04-271-16/+0
| | | | | | | The contents are outdated and irrelevant since the "best practice" is automatically enforced. Documenting the PR flow is out of the Best Practices guide.
* Move link to BUILD.md to README.mdRodolfo Carvalho2017-04-272-5/+4
| | | | | | | Most people contributing to the project do not need to build an RPM, so it can be left out of the Contribution Guide. Placing it in the README for still some visibility.
* Merge pull request #3961 from codificat/qe-container-docOpenShift Bot2017-04-263-28/+52
|\ | | | | Merged by openshift-bot
| * Move container build instructions to BUILD.mdPep Turró Mauri2017-04-243-21/+26
| |
| * Elaborate container image usage instructionsPep Turró Mauri2017-04-241-7/+26
| | | | | | | | | | Explain that the base image expects to run as non-root and the implications of this, and expand the example 'docker run' options in detail.
* | Automatic commit of package [openshift-ansible] release [3.6.38-1].Jenkins CD Merge Bot2017-04-262-2/+25
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | Merge pull request #4005 from jlebon/pr/rhci-journalsOpenShift Bot2017-04-262-20/+34
|\ \ | | | | | | Merged by openshift-bot
| * | .redhat-ci.yml: also publish journal logsJonathan Lebon2017-04-252-20/+34
| | | | | | | | | | | | | | | | | | | | | - Update to only target v3.6.0-alpha.1 (will open another PR to target the newly released 1.5.0 on the 1.5 branch). - Move test script to its own file. - Upload journal logs on failure.
* | | Merge pull request #3816 from sosiouxme/20170328-integration-testsOpenShift Bot2017-04-2630-1/+948
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | integration tests: add CI scriptsLuke Meyer2017-04-259-33/+221
| | | | | | | | | | | | | | | | | | | | | | | | Add some scripts that can be run from Jenkins to build/push test images and to run the tests. Updated README to expand on running tests.
| * | | preflight int tests: define image builds to support testsLuke Meyer2017-04-2510-0/+219
| | | |
| * | | preflight int tests: generalize; add testsLuke Meyer2017-04-2520-98/+406
| | | | | | | | | | | | | | | | | | | | | | | | Make the container setup and teardown more reusable. Remove example tests. Add basic package tests.
| * | | Add stub of preflight integration testsRodolfo Carvalho2017-04-2510-0/+232
| | | |
| * | | Move Python unit tests to subdirectoryRodolfo Carvalho2017-04-251-1/+1
| | | | | | | | | | | | | | | | To make room for integration tests.
* | | | Merge pull request #3950 from lhuard1A/enterprise_ose_3.5OpenShift Bot2017-04-261-3/+6
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Make the rhel_subscribe role subscribe to OSE 3.5 channel by defaultLénaïc Huard2017-04-191-3/+6
| | | | |
* | | | | Merge pull request #3860 from sdodson/backup-v3-dataOpenShift Bot2017-04-251-32/+28
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Cleanup comments and remove extraneous tasksScott Dodson2017-04-101-23/+7
| | | | | |
| * | | | | Store backups in /var/lib/etcd/openshift-backupScott Dodson2017-04-101-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because containerized installs don't mount /var/lib/origin and we switched to running the backup inside the container that meant that we were backing up the etcd data into a directory inside the container filesystem. Since we have no other volume mounted we need to backup into /var/lib/etcd.
| * | | | | Create member/snap directory encase it doesn't existScott Dodson2017-04-071-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes TASK [Copy etcd v3 data store] ************************************************* fatal: [host.redhat.com]: FAILED! => { "changed": true, "cmd": [ "cp", "-a", "/var/lib/etcd//member/snap", "/var/lib/origin/etcd-backup-pre-upgrade-20170407055413/member/" ], "delta": "0:00:00.003152", "end": "2017-04-07 01:54:17.584685", "failed": true, "rc": 1, "start": "2017-04-07 01:54:17.581533", "warnings": [] } STDERR: cp: cannot create directory ?/var/lib/origin/etcd-backup-pre-upgrade-20170407055413/member/?: No such file or directory
| * | | | | Copy v3 data dir when performing backupScott Dodson2017-04-051-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1433272
* | | | | | Merge pull request #3970 from mtnbikenc/3_6-upgradeOpenShift Bot2017-04-25138-18/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Standardize all Origin versioning on 3.6Russell Teague2017-04-25138-18/+27
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3988 from abutcher/router-cert-varsOpenShift Bot2017-04-252-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Replace original router cert variable names.Andrew Butcher2017-04-242-10/+10
| | | | | | |
* | | | | | | Merge pull request #3968 from jarrpa/oc_obj-kindsOpenShift Bot2017-04-253-14/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Merged by openshift-bot
| * | | | | | oc_obj: Allow for multiple kinds in deleteJose A. Rivera2017-04-213-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | Merge pull request #3962 from sdodson/image-stream-syncOpenShift Bot2017-04-256-8/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Update v1.5 contentScott Dodson2017-04-203-4/+25
| | | | | | | |
| * | | | | | | Update v1.6 contentScott Dodson2017-04-203-4/+25
| | | | | | | |
* | | | | | | | Merge pull request #3911 from ewolinetz/logging_15_picksOpenShift Bot2017-04-255-159/+202
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Merged by openshift-bot
| * | | | | | | Addressing yamllintewolinetz2017-04-131-4/+4
| | | | | | | |
| * | | | | | | Updating kibana-proxy secret key for server-tls entryewolinetz2017-04-131-1/+1
| | | | | | | |
| * | | | | | | Pick from issue3896ewolinetz2017-04-134-154/+197
| | | | | | | |
* | | | | | | | Merge pull request #3998 from openshift/revert-3955-fix_etcd_pathsScott Dodson2017-04-251-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Revert "Add /etc/sysconfig/etcd to etcd_container"
| * | | | | | | | Revert "Add /etc/sysconfig/etcd to etcd_container"Scott Dodson2017-04-251-1/+1
|/ / / / / / / /
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.37-1].Jenkins CD Merge Bot2017-04-252-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | Merge pull request #3990 from abutcher/custom-router-cert-replace-ngScott Dodson2017-04-251-1/+60
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Replace custom router certificate during redeploy
| * | | | | | | | Differentiate between service serving router certificate and custom ↵Andrew Butcher2017-04-241-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_hosted_router_certificate when replacing the router certificate.
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.36-1].Jenkins CD Merge Bot2017-04-252-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | | Merge pull request #3976 from mtnbikenc/swap-updateOpenShift Bot2017-04-252-16/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Update swap disable tasksRussell Teague2017-04-212-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Lines are commented out vice being removed * Comment is added indicating why the change happened * Variable openshift_disable_swap added to allow user control
* | | | | | | | | | Merge pull request #3932 from richm/muxOpenShift Bot2017-04-2414-0/+413
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | cast openshift_logging_use_mux_client to boolRich Megginson2017-04-191-2/+2
| | | | | | | | | | |
| * | | | | | | | | | mux does not require privileged, only hostmount-anyuidRich Megginson2017-04-1914-0/+413
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3481 from jpkrohling/JPK-SwitchHeapsterToUseGeneratedCertsOpenShift Bot2017-04-245-44/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Switched Heapster to use certificates generated by OpenShiftJuraci Paixão Kröhling2017-04-185-44/+31
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |