Skip to content

Commit

Permalink
feat(makefile): allow running a single e2e test from the make command
Browse files Browse the repository at this point in the history
  • Loading branch information
ecordell committed Aug 2, 2018
1 parent a5635c2 commit c2429c6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
12 changes: 12 additions & 0 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@ To run the tests for all go packages outside of the vendor directory, run:
$ make test
```

To run the e2e tests locally:

```sh
$ make e2e-local
```

To run a specific e2e test locally:

```sh
$ make e2e-local TEST=TestCreateInstallPlanManualApproval
```

#### Building

Ensure your version of go is up to date; check that you're running v1.9 with the
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ run-local-shift:

e2e-local:
. ./scripts/build_local.sh
. ./scripts/run_e2e_local.sh
. ./scripts/run_e2e_local.sh $(TEST)

e2e-local-shift:
. ./scripts/build_local_shift.sh
. ./scripts/run_e2e_local.sh
. ./scripts/run_e2e_local.sh $(TEST)

e2e-local-docker:
. ./scripts/build_local.sh
. ./scripts/run_e2e_docker.sh
. ./scripts/run_e2e_docker.sh $(TEST)

DEP := $(GOPATH)/bin/dep
$(DEP):
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/operators/catalog/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func NewOperator(kubeconfigPath string, wakeupInterval time.Duration, operatorNa
// Create an informer for each catalog namespace
catsrcSharedIndexInformers := []cache.SharedIndexInformer{}
for _, namespace := range []string{operatorNamespace} {
nsInformerFactory := externalversions.NewFilteredSharedInformerFactory(crClient, wakeupInterval, namespace, nil)
nsInformerFactory := externalversions.NewSharedInformerFactoryWithOptions(crClient, wakeupInterval, externalversions.WithNamespace(namespace))
catsrcSharedIndexInformers = append(catsrcSharedIndexInformers, nsInformerFactory.Operators().V1alpha1().CatalogSources().Informer())
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/registry/resolver/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ func (resolver *MultiSourceResolver) resolveCSV(sourceRefs []registry.SourceRef,

// Add the final step for the CSV to the plan.
log.Infof("finished step: %s", step.Name)
log.Debugf("step %s content: %v", step.Name, step)
steps[currentName] = append(steps[currentName], step)
}

Expand Down

0 comments on commit c2429c6

Please sign in to comment.