diff --git a/.travis.yml b/.travis.yml index 69588142f..2e9ac2d6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,11 @@ before_install: - truncate -s 100G /tmp/disk.img - sudo zpool create -f zfspv-pool /tmp/disk.img install: + - if [ "$TRAVIS_BUILD_DIR" != "$GOPATH/src/github.com/openebs/zfs-localpv" ]; then + mkdir -p $GOPATH/src/github.com/openebs/; + mv $TRAVIS_BUILD_DIR $GOPATH/src/github.com/openebs; + cd $GOPATH/src/github.com/openebs/zfs-localpv; + fi - make bootstrap - make format - curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/amd64/kubectl diff --git a/buildscripts/travis-build.sh b/buildscripts/travis-build.sh index 9c9b397e3..9c0e36b49 100755 --- a/buildscripts/travis-build.sh +++ b/buildscripts/travis-build.sh @@ -14,35 +14,15 @@ set -e # See the License for the specific language governing permissions and # limitations under the License. -SRC_REPO="$TRAVIS_BUILD_DIR" DST_REPO="$GOPATH/src/github.com/openebs/zfs-localpv" function checkGitDiff() { if [[ `git diff --shortstat | wc -l` != 0 ]]; then echo "Some files got changed after $1";printf "\n";git diff --stat;printf "\n"; exit 1; fi } -if [ "$SRC_REPO" != "$DST_REPO" ]; -then - echo "Copying from $SRC_REPO to $DST_REPO" - # Get the git commit - echo "But first, get the git revision from $SRC_REPO" - GIT_COMMIT="$(git rev-parse HEAD)" - echo $GIT_COMMIT >> $SRC_REPO/GITCOMMIT - - mkdir -p $DST_REPO - cp -R $SRC_REPO/* $DST_REPO/ - cd $DST_REPO -fi - #make golint-travis #rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi -echo "Running : make format" -make format -rc=$?; if [[ $rc != 0 ]]; then echo "make format failed"; exit $rc; fi -checkGitDiff "make format" -printf "\n" - echo "Running : make kubegen" make kubegen rc=$?; if [[ $rc != 0 ]]; then echo "make kubegen failed"; exit $rc; fi @@ -54,10 +34,3 @@ rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi make all rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi - -if [ $SRC_REPO != $DST_REPO ]; -then - echo "Copying coverage.txt to $SRC_REPO" - cp coverage.txt $SRC_REPO/ - cd $SRC_REPO -fi