zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #563 from GeorgianaElena/make_pip_spec_optional

Browse Source 
Make bootstrap_pip_spec test argument optional
This commit is contained in:
Georgiana Elena
2020-04-30 16:34:08 +03:00
committed by GitHub
parent 3454ff9c2d c042c283d1
commit 914a1e8c7b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.circleci/config.yml
View File

@@ -56,8 +56,9 @@ commands:
BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$CIRCLE_SHA1 BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$CIRCLE_SHA1
fi fi
.circleci/integration-test.py run-test basic-tests \ .circleci/integration-test.py run-test \
"$BOOTSTRAP_PIP_SPEC" test_hub.py test_install.py test_extensions.py \ --bootstrap_pip_spec "$BOOTSTRAP_PIP_SPEC" \
basic-tests test_hub.py test_install.py test_extensions.py \
<< parameters.upgrade >> << parameters.upgrade >>
admin_tests: admin_tests:
parameters: parameters:
@@ -76,7 +77,8 @@ commands:
.circleci/integration-test.py run-test \ .circleci/integration-test.py run-test \
--installer-args "--admin admin:admin" \ --installer-args "--admin admin:admin" \
basic-tests $BOOTSTRAP_PIP_SPEC test_admin_installer.py \ --bootstrap_pip_spec $BOOTSTRAP_PIP_SPEC \
basic-tests test_admin_installer.py \
<< parameters.upgrade >> << parameters.upgrade >>
plugin_tests: plugin_tests:
@@ -95,8 +97,9 @@ commands:
fi fi
.circleci/integration-test.py run-test \ .circleci/integration-test.py run-test \
--bootstrap_pip_spec $BOOTSTRAP_PIP_SPEC \
--installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \ --installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \
plugins $BOOTSTRAP_PIP_SPEC test_simplest_plugin.py \ plugins test_simplest_plugin.py \
<< parameters.upgrade >> << parameters.upgrade >>
bootstrap_checks: bootstrap_checks:

2
.circleci/integration-test.py
View File

@@ -158,8 +158,8 @@ def main():
run_test_parser = subparsers.add_parser('run-test') run_test_parser = subparsers.add_parser('run-test')
run_test_parser.add_argument('--installer-args', default='') run_test_parser.add_argument('--installer-args', default='')
run_test_parser.add_argument('--upgrade', action='store_true') run_test_parser.add_argument('--upgrade', action='store_true')
run_test_parser.add_argument('--bootstrap_pip_spec', nargs='?', default="", type=str)
run_test_parser.add_argument('test_name') run_test_parser.add_argument('test_name')
run_test_parser.add_argument('bootstrap_pip_spec')
run_test_parser.add_argument('test_files', nargs='+') run_test_parser.add_argument('test_files', nargs='+')
show_logs_parser = subparsers.add_parser('show-logs') show_logs_parser = subparsers.add_parser('show-logs')