diff --git a/.travis.yml b/.travis.yml index cbd619d4c28..65774ffda74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,5 @@ branches: jobs: include: - stage: Lint & Test - script: ./hack/gotest.sh - name: Installer unit tests - - script: ./hack/go-lint.sh installer/... + script: ./hack/go-lint.sh installer/... name: Go lint diff --git a/hack/gotest.sh b/hack/gotest.sh deleted file mode 100755 index c9ca0c0a172..00000000000 --- a/hack/gotest.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -if [ "$IS_CONTAINER" != "" ]; then - cd .. - SOURCE_DIR="$(pwd)" - cd .. || exit - ROOT_DIR="$(pwd)" - # if running in a local prow instance, with repo ../not-openshift/installer, have to modify here - TARGET_DIR="${ROOT_DIR}/openshift" - if [ "$SOURCE_DIR" != "$TARGET_DIR" ]; then - mv "$SOURCE_DIR" "$TARGET_DIR" - fi; - cd "${TARGET_DIR}/installer/" || exit - CGO_ENABLED=0 go test ./installer/... -else - docker run -e IS_CONTAINER='TRUE' -v "$PWD":/go/src/github.com/openshift/installer -w /go/src/github.com/openshift/installer quay.io/coreos/golang-testing ./hack/gotest.sh -fi -