diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..c8345088909 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,21 @@ +language: go + +go: + - "1.10" + - "1.11" + - "1.12" + +go_import_path: github.com/kubeflow/katib + +install: + - curl -L -O "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v1.0.7/kubebuilder_1.0.7_linux_amd64.tar.gz" + - # extract the archive + - tar -zxvf kubebuilder_1.0.7_linux_amd64.tar.gz + - sudo mv kubebuilder_1.0.7_linux_amd64 /usr/local/kubebuilder + - export PATH=$PATH:/usr/local/kubebuilder/bin + # get coveralls.io support + - go get github.com/mattn/goveralls + +script: + - make test + - goveralls -coverprofile=coverage.out diff --git a/Makefile b/Makefile index 5f5530ab9a6..1488e96f36d 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ # Run tests +.PHONY: test test: - go test ./pkg/... ./cmd/... + go test ./pkg/... ./cmd/... -coverprofile coverage.out # Build Katib images build: - sh scripts/v1alpha1/build.sh + bash scripts/v1alpha1/build.sh # Deploy katib manifests into a k8s cluster deploy: - sh scripts/v1alpha1/deploy.sh + bash scripts/v1alpha1/deploy.sh # Run go fmt against code fmt: diff --git a/README.md b/README.md index f98094596fd..90acc8ddfab 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@
+[![Build Status](https://travis-ci.org/kubeflow/katib.svg?branch=master)](https://travis-ci.org/kubeflow/katib) +[![Coverage Status](https://coveralls.io/repos/github/kubeflow/katib/badge.svg?branch=master)](https://coveralls.io/github/kubeflow/katib?branch=master) [![Go Report Card](https://goreportcard.com/badge/github.com/kubeflow/katib)](https://goreportcard.com/report/github.com/kubeflow/katib) Hyperparameter Tuning on Kubernetes. diff --git a/pkg/api/operators/apis/experiment/v1alpha2/experiment_defaults.go b/pkg/api/operators/apis/experiment/v1alpha2/experiment_defaults.go index af801465ccd..b178eb3f979 100644 --- a/pkg/api/operators/apis/experiment/v1alpha2/experiment_defaults.go +++ b/pkg/api/operators/apis/experiment/v1alpha2/experiment_defaults.go @@ -30,15 +30,15 @@ func (e *Experiment) SetDefault() { func (e *Experiment) setDefaultParallelTrialCount() { if e.Spec.ParallelTrialCount == nil { - e.Spec.ParallelTrialCount = new(int32) - *e.Spec.ParallelTrialCount = DefaultTrialParallelCount - } + e.Spec.ParallelTrialCount = new(int32) + *e.Spec.ParallelTrialCount = DefaultTrialParallelCount + } } func (e *Experiment) setDefaultTrialTemplate() { t := e.Spec.TrialTemplate if t == nil { - t = &TrialTemplate { + t = &TrialTemplate{ Retain: true, } } @@ -48,8 +48,8 @@ func (e *Experiment) setDefaultTrialTemplate() { if t.GoTemplate.RawTemplate == "" && t.GoTemplate.TemplateSpec == nil { t.GoTemplate.TemplateSpec = &TemplateSpec{ ConfigMapNamespace: os.Getenv(DefaultKatibNamespaceEnvName), - ConfigMapName: DefaultTrialConfigMapName, - TemplatePath: DefaultTrialTemplatePath, + ConfigMapName: DefaultTrialConfigMapName, + TemplatePath: DefaultTrialTemplatePath, } } e.Spec.TrialTemplate = t diff --git a/pkg/common/v1alpha2/katib_manager_util.go b/pkg/common/v1alpha2/katib_manager_util.go index 3b2cd7fb489..4eb7884688c 100644 --- a/pkg/common/v1alpha2/katib_manager_util.go +++ b/pkg/common/v1alpha2/katib_manager_util.go @@ -134,4 +134,4 @@ func GetSuggestions(request *api_pb.GetSuggestionsRequest) (*api_pb.GetSuggestio defer closeKatibManagerConnection(kcc) kc := kcc.KatibManagerClient return kc.GetSuggestions(ctx, request) -} \ No newline at end of file +} diff --git a/pkg/controller/v1alpha1/studyjob/manifest_parser.go b/pkg/controller/v1alpha1/studyjob/manifest_parser.go index 936e2bb501d..40313a1e023 100644 --- a/pkg/controller/v1alpha1/studyjob/manifest_parser.go +++ b/pkg/controller/v1alpha1/studyjob/manifest_parser.go @@ -20,9 +20,9 @@ import ( "fmt" "text/template" - common "github.com/kubeflow/katib/pkg/common/v1alpha1" katibv1alpha1 "github.com/kubeflow/katib/pkg/api/operators/apis/studyjob/v1alpha1" katibapi "github.com/kubeflow/katib/pkg/api/v1alpha1" + common "github.com/kubeflow/katib/pkg/common/v1alpha1" "github.com/kubeflow/katib/pkg/manager/v1alpha1/studyjobclient" "k8s.io/apimachinery/pkg/util/uuid" diff --git a/pkg/controller/v1alpha2/experiment/manifest/generator_test.go b/pkg/controller/v1alpha2/experiment/manifest/generator_test.go index 1340ba2a301..df8429d0533 100644 --- a/pkg/controller/v1alpha2/experiment/manifest/generator_test.go +++ b/pkg/controller/v1alpha2/experiment/manifest/generator_test.go @@ -129,7 +129,7 @@ data: - "fakens" - "-mn" - "test"` - + if expected != actual.String() { t.Errorf("Expected %s, got %s", expected, actual) } diff --git a/pkg/controller/v1alpha2/trial/trial_controller.go b/pkg/controller/v1alpha2/trial/trial_controller.go index c81ed9793cc..ebc8e331086 100644 --- a/pkg/controller/v1alpha2/trial/trial_controller.go +++ b/pkg/controller/v1alpha2/trial/trial_controller.go @@ -63,8 +63,8 @@ func Add(mgr manager.Manager) error { // newReconciler returns a new reconcile.Reconciler func newReconciler(mgr manager.Manager) reconcile.Reconciler { r := &ReconcileTrial{ - Client: mgr.GetClient(), - scheme: mgr.GetScheme(), + Client: mgr.GetClient(), + scheme: mgr.GetScheme(), ManagerClient: managerclient.New(), } r.updateStatusHandler = r.updateStatus