internet/community.okd
3
0
Fork 0
mirror of https://github.com/openshift/community.okd.git synced 2026-03-27 03:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

combine incluster-integration and separate regular integration scripts (#23)

Browse Source 
* combine incluster-integration and separate regular integration scripts

* Fixup Makefile

* make downstream test use venv if docker isn't an option
This commit is contained in:
Fabian von Feilitzsch
2020-09-09 14:12:04 -04:00
committed by GitHub
parent 80ae2e6b1e
commit 1339e2bdf7
5 changed files with 17 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci/downstream.sh
View File

@@ -170,7 +170,13 @@ f_test_sanity_option()
## Can't do this because the upstream community.kubernetes dependency logic
## is bound as a Makefile dep to the test-sanity target
#SANITY_TEST_ARGS="--docker --color --python 3.6" make test-sanity
ansible-test sanity --docker -v --exclude ci/ --color --python 3.6
# Run tests in docker if available, venv otherwise
if command -v docker &> /dev/null
then
ansible-test sanity --docker -v --exclude ci/ --color --python 3.6
else
ansible-test sanity --venv -v --exclude ci/ --color --python 3.6
fi
popd || return
f_cleanup
}