From d8f5b0f36a389776ed85bd6020af7203ec4c8efb Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Mon, 28 Apr 2014 15:33:00 -0400 Subject: [PATCH 1/3] adding support to run jenkins triggered by travis Signed-off-by: Thiago da Silva --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cdc78f3..85c873a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,3 +10,7 @@ install: "pip install tox nose" script: - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then tox -e py26; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e py27; fi + - if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then curl http://build.gluster.org/job/swiftonfile-builds/buildWithParameters?token=swiftonfile\&cause=http://github.com/swiftonfile/swiftonfile\&TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST + - if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then curl http://build.gluster.org/job/swiftonfile-builds/buildWithParameters?token=swiftonfile\&cause=http://github.com/swiftonfile/swiftonfile/pull/$TRAVIS_PULL_REQUEST\&TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST; fi + + From 3568b6457c40fbd66658671f0b71c95d8e5d7c2b Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Mon, 28 Apr 2014 15:45:44 -0400 Subject: [PATCH 2/3] fixing missing fi Signed-off-by: Thiago da Silva --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85c873a..04e5272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: "pip install tox nose" script: - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then tox -e py26; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e py27; fi - - if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then curl http://build.gluster.org/job/swiftonfile-builds/buildWithParameters?token=swiftonfile\&cause=http://github.com/swiftonfile/swiftonfile\&TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST + - if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then curl http://build.gluster.org/job/swiftonfile-builds/buildWithParameters?token=swiftonfile\&cause=http://github.com/swiftonfile/swiftonfile\&TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST; fi - if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then curl http://build.gluster.org/job/swiftonfile-builds/buildWithParameters?token=swiftonfile\&cause=http://github.com/swiftonfile/swiftonfile/pull/$TRAVIS_PULL_REQUEST\&TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST; fi From 34b5a8bf7dbd1e0f2033d0523a18ae96a54ad5fc Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Mon, 28 Apr 2014 19:30:38 -0400 Subject: [PATCH 3/3] removing blank lines Signed-off-by: Thiago da Silva --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04e5272..46a4086 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,3 @@ script: - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e py27; fi - if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then curl http://build.gluster.org/job/swiftonfile-builds/buildWithParameters?token=swiftonfile\&cause=http://github.com/swiftonfile/swiftonfile\&TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST; fi - if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then curl http://build.gluster.org/job/swiftonfile-builds/buildWithParameters?token=swiftonfile\&cause=http://github.com/swiftonfile/swiftonfile/pull/$TRAVIS_PULL_REQUEST\&TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST; fi - -