Skip to content

Commit cc11631

Browse files
committed
chore(travis): move travis to Python only testing
Many things are included by default when using python as the language (https://docs.travis-ci.com/user/languages/python) Removing caching since we are in sudo mode so no caching is happning but also the pip directory is already cache if we are on the container based infrastructure (https://docs.travis-ci.com/user/caching/#pip-cache)
1 parent 9d5cf2f commit cc11631

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

.travis.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
language: go
2-
go:
3-
- 1.5.1
4-
env:
5-
- GO15VENDOREXPERIMENT=1
1+
language: python
2+
python:
3+
- 3.5
64
branches:
75
only:
86
- master
9-
cache:
10-
directories:
11-
- $HOME/.cache/pip
12-
- $HOME/venv
137
services:
148
- docker
159
- postgresql
@@ -19,9 +13,6 @@ addons:
1913
before_install:
2014
- wget "http://ftp.debian.org/debian/pool/main/s/shellcheck/shellcheck_0.3.7-5_amd64.deb"
2115
- sudo dpkg -i shellcheck_0.3.7-5_amd64.deb
22-
- sudo pip install virtualenv
23-
- virtualenv -p python3.5 $HOME/venv
24-
- source $HOME/venv/bin/activate
2516
- createdb -U postgres deis
2617
install:
2718
- pip install -r rootfs/requirements.txt

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ include versioning.mk
99
SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(wildcard _scripts/*.sh)
1010

1111
# Get the component informtation to a tmp location and get replica count
12+
KUBE := $(shell which kubectl)
13+
ifdef KUBE
1214
$(shell kubectl get rc deis-$(COMPONENT) --namespace deis -o yaml > /tmp/deis-$(COMPONENT))
1315
DESIRED_REPLICAS=$(shell kubectl get -o template rc/deis-$(COMPONENT) --template={{.status.replicas}} --namespace deis)
16+
endif
1417

1518
check-docker:
1619
@if [ -z $$(which docker) ]; then \

0 commit comments

Comments
 (0)