From e1b3b7a0adaf4d2e98eefb50b6ee9f305fb6efd4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 1 Jul 2014 11:45:58 +0530 Subject: [PATCH 01/12] Update shippable.yml --- shippable.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 3bdcdf82..34e81b8e 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,8 +1,13 @@ language: python python: + - 2.6 - 2.7 - + - 3.2 + - 3.3 + - 3.4 + - pypy + install: - pip install -r requirements.txt @@ -14,4 +19,8 @@ before_script: script: - nosetests test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - which python && coverage run --branch test.py - - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py \ No newline at end of file + - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py + +notifications: + email: + - exampleone@org.com From de9d2fdb6383dbaa8cf63b4c5897b1fa5ea68b71 Mon Sep 17 00:00:00 2001 From: Patrick Ellis Date: Tue, 22 Jul 2014 11:48:12 -0700 Subject: [PATCH 02/12] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ec522d27..0f675189 100755 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ Python Sample ===================== Simple Python sample with tests using Nose and Coverage. + +This sample is built for Shippable, a docker based continuous integration and deployment platform. From bbf732f772dfa47312784cc11d1a262d5a8fd2ac Mon Sep 17 00:00:00 2001 From: ragsden Date: Thu, 16 Oct 2014 12:29:57 -0700 Subject: [PATCH 03/12] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 34e81b8e..eda56114 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,5 @@ language: python - +build_image: shippableimages/ubuntu1204_python python: - 2.6 - 2.7 From 087c930c418ea0aa9410a48ac5cf594ebf89efd1 Mon Sep 17 00:00:00 2001 From: Brent O'Connor Date: Thu, 25 Jun 2015 10:15:14 -0500 Subject: [PATCH 04/12] Fixed tests getting run twice Currently tests are getting run twice, when they only need to be run once. I also added .coveragerc file to control coverage settings. --- .coveragerc | 9 +++++++++ .gitignore | 2 ++ shippable.yml | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 .coveragerc create mode 100644 .gitignore diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 00000000..34a1bebf --- /dev/null +++ b/.coveragerc @@ -0,0 +1,9 @@ +# .coveragerc to control coverage + +[run] +branch = True + +source = . + +[html] +directory = htmlcov diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..89437a9d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.coverage +shippable/ diff --git a/shippable.yml b/shippable.yml index eda56114..64c88347 100755 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,7 @@ python: - 3.3 - 3.4 - pypy - + install: - pip install -r requirements.txt @@ -17,9 +17,9 @@ before_script: - mkdir -p shippable/codecoverage script: - - nosetests test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - - which python && coverage run --branch test.py - - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py + - which python + - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml + - coverage xml -o shippable/codecoverage/coverage.xml notifications: email: From 90fd73b3a0843a1241dc44d11196b94b6a53558b Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Thu, 4 Feb 2016 14:09:35 +0530 Subject: [PATCH 05/12] Update shippable.yml --- shippable.yml | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/shippable.yml b/shippable.yml index 64c88347..51629367 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,26 +1,36 @@ language: python -build_image: shippableimages/ubuntu1204_python + python: - - 2.6 - - 2.7 - - 3.2 - - 3.3 - 3.4 - - pypy -install: - - pip install -r requirements.txt +env: + global: + - FOO=FUBU + + matrix: + - M1=ONE + +build: + pre_ci: + - docker build -t=shippabledocker/hitchcock2_sample_python . + + pre_ci_boot: + image_name: shippabledocker/hitchcock2_sample_python + image_tag: latest + pull: false + options: '--privileged=true --net=bridge -e FOO=true -e BOO=false' -# Make folders for the reports -before_script: - - mkdir -p shippable/testresults - - mkdir -p shippable/codecoverage + ci: + - ps -eax + - ls -al -script: - - which python - - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - - coverage xml -o shippable/codecoverage/coverage.xml + post_ci: + - docker push shippabledocker/hitchcock2_sample_python -notifications: - email: - - exampleone@org.com +integrations: + hub: + - integrationName: ship-docker + type: docker + branches: + only: + - master From 167a294d0fc0926f3d6dc5a8489a613f45b6b412 Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Thu, 4 Feb 2016 14:14:02 +0530 Subject: [PATCH 06/12] Create Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..61a5e700 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM drydock/u12pyt:prod + +RUN mkdir -p /tmp/logs From 92b6166e59a87a5934c967dca48ec26ccb34d911 Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Thu, 4 Feb 2016 14:20:34 +0530 Subject: [PATCH 07/12] [skip ci] --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 51629367..2096c8a5 100755 --- a/shippable.yml +++ b/shippable.yml @@ -27,6 +27,7 @@ build: post_ci: - docker push shippabledocker/hitchcock2_sample_python + integrations: hub: - integrationName: ship-docker From aa9e81339d2beb8eaf1fdb5f5c91e1df8e65a144 Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Tue, 9 Feb 2016 15:47:49 +0530 Subject: [PATCH 08/12] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 2096c8a5..536261ea 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,6 @@ language: python + python: - 3.4 From b4db55becfcc470acbaa1e53a24733bfd5f0cae7 Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Tue, 9 Feb 2016 16:38:29 +0530 Subject: [PATCH 09/12] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 536261ea..2096c8a5 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,6 +1,5 @@ language: python - python: - 3.4 From 9336e7872c259f398816818c4ad632f5e47d028a Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Tue, 9 Feb 2016 17:29:37 +0530 Subject: [PATCH 10/12] Update shippable.yml --- shippable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shippable.yml b/shippable.yml index 2096c8a5..34939d93 100755 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,9 @@ env: matrix: - M1=ONE +branches: + except: + - master build: pre_ci: From 04aee5217835cd248fb764e9a667d95e0e279610 Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Thu, 11 Feb 2016 14:38:31 +0530 Subject: [PATCH 11/12] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 34939d93..4413acc0 100755 --- a/shippable.yml +++ b/shippable.yml @@ -3,6 +3,7 @@ language: python python: - 3.4 + env: global: - FOO=FUBU From 38a9f5ea9cf5e9b55981f98b811332e27fbf289b Mon Sep 17 00:00:00 2001 From: shiphitchcock2 Date: Thu, 11 Feb 2016 14:38:55 +0530 Subject: [PATCH 12/12] Update shippable.yml --- shippable.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 4413acc0..376fe1ce 100755 --- a/shippable.yml +++ b/shippable.yml @@ -10,9 +10,7 @@ env: matrix: - M1=ONE -branches: - except: - - master + build: pre_ci: