From 5320b43c05917754a64d581a3432f1263e0783fa Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Mon, 24 Feb 2020 14:12:42 +0200 Subject: [PATCH] Use commit to install --- .circleci/config.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 66cad18..c6eef70 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,12 +57,7 @@ commands: - run: name: Run basic tests command: | - PR_INFO_URL=https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER - PR_BRANCH=`(curl -s $PR_INFO_URL | jq -r ".head.ref")` - if [ "$PR_BRANCH" == "null" ];then - PR_BRANCH=$CIRCLE_BRANCH - fi - BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$PR_BRANCH + BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$CIRCLE_SHA1 .circleci/integration-test.py run-test basic-tests \ "$BOOTSTRAP_PIP_SPEC" test_hub.py test_install.py test_extensions.py \ @@ -76,12 +71,7 @@ commands: - run: name: Run admin tests command: | - PR_INFO_URL=https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER - PR_BRANCH=`(curl -s $PR_INFO_URL | jq -r ".head.ref")` - if [ "$PR_BRANCH" == "null" ];then - PR_BRANCH=$CIRCLE_BRANCH - fi - BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$PR_BRANCH + BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$CIRCLE_SHA1 .circleci/integration-test.py run-test \ --installer-args "--admin admin:admin" \ @@ -97,12 +87,7 @@ commands: - run: name: Run plugin tests command: | - PR_INFO_URL=https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER - PR_BRANCH=`(curl -s $PR_INFO_URL | jq -r ".head.ref")` - if [ "$PR_BRANCH" == "null" ];then - PR_BRANCH=$CIRCLE_BRANCH - fi - BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$PR_BRANCH + BOOTSTRAP_PIP_SPEC=git+https://github.com/$CIRCLE_PROJECT_USERNAME/the-littlest-jupyterhub.git@$CIRCLE_SHA1 .circleci/integration-test.py run-test \ --installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \