diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4ddc9c48cb..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -sudo: required -language: go -go: - - "1.12" -before_install: - - export GOPATH=$HOME/go - - export PATH=$HOME/usr/local/go/bin:$GOPATH/bin:$PATH - - mkdir -p $GOPATH/src/github.com/ovn-org - - mv $TRAVIS_BUILD_DIR $GOPATH/src/github.com/ovn-org/ovn-kubernetes - - cd $GOPATH/src/github.com/ovn-org/ovn-kubernetes -install: - - eval "$(gimme 1.12)" -script: - - pushd go-controller - - make - - make windows - - make gofmt - - make install.tools - - make lint - - make check - - popd - - pushd dist/images - - if [ -n "$(git diff --stat origin/master.. | grep dist/images/Dockerfile)" ]; then make all; fi - - popd diff --git a/Dockerfile b/Dockerfile index deb888ca41..9eedb6c201 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,14 +36,14 @@ RUN INSTALL_PKGS=" \ PyYAML openssl firewalld-filesystem \ libpcap iproute strace \ openvswitch2.12 openvswitch2.12-devel \ + ovn2.12 ovn2.12-central ovn2.12-host ovn2.12-vtep \ containernetworking-plugins yum-utils \ " && \ yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False $INSTALL_PKGS && \ - yumdownloader ovn2.11 ovn2.11-central ovn2.11-host ovn2.11-vtep && \ - rpm -Uhv --force --nodeps ovn2.11* && rm -f *.rpm && \ yum clean all && rm -rf /var/cache/* RUN mkdir -p /var/run/openvswitch && \ + mkdir -p /var/run/ovn && \ mkdir -p /etc/cni/net.d && \ mkdir -p /opt/cni/bin && \ mkdir -p /usr/libexec/cni/ && \ diff --git a/go-controller/hack/lint.sh b/go-controller/hack/lint.sh index 9afed5797a..23e95f8fe7 100755 --- a/go-controller/hack/lint.sh +++ b/go-controller/hack/lint.sh @@ -2,5 +2,5 @@ GO111MODULE=on ${GOPATH}/bin/golangci-lint run \ --tests=false --enable gofmt \ - --timeout=5m0s \ + --timeout=10m0s \ && echo "lint OK!"