Skip to content

Commit

Permalink
Merge branch 'master' into fixTypo
Browse files Browse the repository at this point in the history
  • Loading branch information
tkyi authored Jan 7, 2020
2 parents 0da02ba + e76e6bd commit ae846a0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions screwdriver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ jobs:
- setup-ci: git clone https://github.com/screwdriver-cd/toolbox.git ci
- wait-docker: DOCKER_TAG=`meta get docker_tag` ./ci/docker-wait.sh
- deploy-k8s: K8S_TAG=`meta get docker_tag` ./ci/k8s-deploy.sh
- test: npm install && npm run functional
- test: |
export GIT_TOKEN=$GIT_TOKEN_PROD
npm install && npm run functional
environment:
DOCKER_REPO: screwdrivercd/screwdriver
K8S_CONTAINER: screwdriver-api
Expand All @@ -93,6 +95,6 @@ jobs:
# Access key for functional tests
- SD_API_TOKEN
# Git access token
- GIT_TOKEN
- GIT_TOKEN_PROD
# Talking to Kubernetes
- K8S_TOKEN

0 comments on commit ae846a0

Please sign in to comment.