Skip to content

Commit

Permalink
- tried to fix ci file
Browse files Browse the repository at this point in the history
- change in buildscripts tobring notice to an error
- move repo aout of GOPATH/src wherever referenced

Signed-off-by: vaniisgh <vanisingh@live.co.uk>
  • Loading branch information
vaniisgh committed Jun 4, 2020
1 parent 0d45262 commit 838721e
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 31 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Expand Up @@ -23,11 +23,10 @@ before_install:
- truncate -s 100G /tmp/disk.img
- sudo zpool create -f zfspv-pool /tmp/disk.img
install:
- if [ "$TRAVIS_BUILD_DIR" != "$/openebs/zfs-localpv" ]; then
mkdir -p $/openebs/;
mv $TRAVIS_BUILD_DIR $/openebs;
cd $/openebs/zfs-localpv;
fi
- if [ "$TRAVIS_BUILD_DIR" != "$HOME/openebs/zfs-localpv" ]; then
mkdir -p $HOME/openebs/;
mv $TRAVIS_BUILD_DIR $HOME/openebs;
cd $HOME/openebs/zfs-localpv;
- make bootstrap
- make format
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/amd64/kubectl
Expand Down
6 changes: 3 additions & 3 deletions buildscripts/build.sh
Expand Up @@ -12,9 +12,9 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/../" && pwd )"
cd "$DIR"

# Get the git commit
if [ -f $GOPATH/src/github.com/openebs/zfs-localpv/GITCOMMIT ];
if [ -f $HOME/openebs/zfs-localpv/GITCOMMIT ];
then
GIT_COMMIT="$(cat $GOPATH/src/github.com/openebs/zfs-localpv/GITCOMMIT)"
GIT_COMMIT="$(cat $HOME/openebs/zfs-localpv/GITCOMMIT)"
else
GIT_COMMIT="$(git rev-parse HEAD)"
fi
Expand Down Expand Up @@ -43,7 +43,7 @@ fi

echo -e "\nbuilding the ZFS Driver version :- $VERSION\n"

VERSION_META="$(cat $GOPATH/src/github.com/openebs/zfs-localpv/BUILDMETA)"
VERSION_META="$(cat $HOME/openebs/zfs-localpv/BUILDMETA)"

# Determine the arch/os combos we're building for
UNAME=$(uname)
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/travis-build.sh
Expand Up @@ -14,7 +14,7 @@ set -e
# See the License for the specific language governing permissions and
# limitations under the License.

DST_REPO="$GOPATH/src/github.com/openebs/zfs-localpv"
DST_REPO="$HOME/openebs/zfs-localpv"

function checkGitDiff() {
if [[ `git diff --shortstat | wc -l` != 0 ]]; then echo "Some files got changed after $1";printf "\n";git diff;printf "\n"; exit 1; fi
Expand Down
5 changes: 4 additions & 1 deletion buildscripts/zfs-driver/Dockerfile
Expand Up @@ -15,7 +15,10 @@
FROM ubuntu:19.10
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
RUN apt-get update; exit 0
RUN apt-get -y install rsyslog libssl-dev xfsprogs ca-certificates
RUN apt-get -y install rsyslog
# adding the libraries listed below throws error on make
#libssl-dev xfsprogs ca-certificates


ARG ARCH
ARG DBUILD_DATE
Expand Down
31 changes: 10 additions & 21 deletions go.mod
Expand Up @@ -3,45 +3,35 @@ module github.com/openebs/zfs-localpv
go 1.14

require (
github.com/axw/gocov v1.0.0 // indirect
github.com/container-storage-interface/spec v1.1.0
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/go-units v0.4.0
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/ghodss/yaml v1.0.0
github.com/gogo/protobuf v1.3.0 // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/protobuf v1.3.2
github.com/google/gofuzz v1.0.0 // indirect
github.com/golang/protobuf v1.4.2
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/hpcloud/tail v1.0.0 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
github.com/json-iterator/go v1.1.7 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kubernetes-csi/csi-lib-utils v0.6.1
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/onsi/ginkgo v1.10.3
github.com/onsi/gomega v1.7.1
github.com/onsi/ginkgo v1.12.3
github.com/onsi/gomega v1.10.1
github.com/pkg/errors v0.8.1
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.3 // indirect
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
github.com/ugorji/go/codec/codecgen v1.1.7 // indirect
golang.org/x/net v0.0.0-20200602114024-627f9648deb9
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13
golang.org/x/text v0.3.2 // indirect
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
golang.org/x/tools v0.0.0-20190903025054-afe7f8212f0d // indirect
golang.org/x/tools v0.0.0-20200603170713-0310561d584d // indirect
google.golang.org/appengine v1.6.2 // indirect
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
google.golang.org/grpc v1.23.0
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
google.golang.org/grpc v1.27.0
google.golang.org/protobuf v1.24.0 // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
Expand All @@ -51,7 +41,6 @@ require (
k8s.io/kubernetes v1.15.3
k8s.io/utils v0.0.0-20190829053155-3a4a5477acf8 // indirect
sigs.k8s.io/controller-runtime v0.2.0
sigs.k8s.io/yaml v1.1.0 // indirect
)

replace (
Expand Down

0 comments on commit 838721e

Please sign in to comment.