Skip to content

Commit 21addc8

Browse files
committed
ref(*): slim down to just client and controller
1 parent 1cfaef3 commit 21addc8

1,465 files changed

Lines changed: 243 additions & 224459 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -18,73 +18,22 @@ lib64
1818
controller/deis/local_settings.py
1919
controller/.secret_key
2020

21-
# application logs
22-
logs/
23-
2421
# local binaries, installers, and artifacts
25-
builder/rootfs/usr/bin
26-
cache/image/bin/
2722
client/deis
2823
client/deis.exe
2924
client/*.run
3025
client/makeself/
31-
contrib/azure/azure-user-data
32-
contrib/bumpver/bumpver
33-
deisctl/deisctl
34-
deisctl/dist/
35-
deisctl/package/
36-
deisctl/makeself/
3726
docs/_build/
3827
docs/docs.zip
3928
docs/dummy.sqlite3
40-
logger/image/bin/logger
41-
logspout/build/
42-
logspout/image/logspout
43-
logspout/Godeps/
44-
publisher/Godeps/
45-
publisher/image/bin/publisher
46-
swarm/image/bin/
47-
mesos/**/bin/
48-
mesos/**/bindata/
49-
mesos/Dockerfile
50-
mesos/marathon-assembly.jar
5129

5230
# coverage reports
5331
.coverage
5432
coverage.out
5533
htmlcov/
5634

57-
# integration test droppings
58-
tests/example-*
59-
tests/*.cert
60-
tests/*.key
61-
62-
# extra .py droppings from building docs
63-
/__init__.py
64-
6535
# python virtual environments for testing
66-
venv
67-
68-
# Local user-data generated from user-data.example
69-
contrib/coreos/user-data
70-
71-
# Local controller settings file
72-
controller/deis/local_settings.py
73-
74-
# AWS CloudFormation Setup
75-
contrib/aws/cloudformation.json
76-
77-
# GCE generated user-data
78-
contrib/gce/gce-user-data
79-
80-
# vagrant local config and droppings
81-
/config.rb
82-
.vagrant
83-
84-
# bash infra
85-
/tests/bin/tmp
86-
!/tests/bin/accept/lib
87-
!/tests/bin/accept/commands
36+
venv/
8837

89-
# Terraform
90-
*.tfstate*
38+
# vendored go source code
39+
vendor/

.travis.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
language: go
2+
go:
3+
- 1.5.1
4+
env:
5+
- GO15VENDOREXPERIMENT=1
6+
branches:
7+
only:
8+
- master
9+
cache:
10+
directories:
11+
- $HOME/.cache/pip
12+
- $GOPATH/src/github.com/deis/helm/vendor
13+
- $HOME/virtualenv/python2.7
14+
services:
15+
- postgresql
16+
sudo: required
17+
addons:
18+
- postgresql: "9.3"
19+
before_install:
20+
- wget "https://github.com/Masterminds/glide/releases/download/0.7.1/glide-0.7.1-linux-amd64.tar.gz"
21+
- sudo tar -vxz -C /usr/local/bin --strip=1 -f glide-0.7.1-linux-amd64.tar.gz
22+
- go get github.com/golang/lint/golint
23+
- wget "http://ftp.debian.org/debian/pool/main/s/shellcheck/shellcheck_0.3.7-4_amd64.deb"
24+
- sudo dpkg -i shellcheck_0.3.7-4_amd64.deb
25+
- sudo pip install virtualenv
26+
- virtualenv $HOME/virtualenv/python2.7
27+
- source $HOME/virtualenv/python2.7/bin/activate
28+
- createdb -U postgres deis
29+
install:
30+
- pip install -r controller/requirements.txt
31+
- pip install -r controller/dev_requirements.txt
32+
- GLIDE_HOME=/home/travis/.glide make -C client bootstrap
33+
script:
34+
- make -C controller test
35+
- make -C client test

0 commit comments

Comments
 (0)