Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ docker-build: $(TEST)

# Build the development Docker image
docker-build-dev: $(TEST)
docker build ./testing -f $(PWD)/testing/dev.Dockerfile -t $(DEV_IMAGE)
docker build ./hack -f $(PWD)/hack/dev.Dockerfile -t $(DEV_IMAGE)

# Builds a local image for the Redis pods from the latest Dockerhub image
docker-build-local-redis:
docker build ./testing -f $(PWD)/testing/redis.Dockerfile -t redis:testing
docker build ./hack -f $(PWD)/hack/redis.Dockerfile -t redis:testing

# Push the docker image
docker-push:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions test/e2e/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## E2E Testing

End-to-end automated testing for the Redis cluster.

```TODO```
18 changes: 18 additions & 0 deletions test/e2e/main_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package e2e

import (
"log"
"os"
"testing"

operatorFramework "github.com/PayU/Redis-Operator/test/framework"
)

func TestMain(m *testing.M) {
framework, err := operatorFramework.New()
if err != nil {
log.Printf("E2e test framework could not be initalized: %v\n", err)
os.Exit(1)
}
_ = framework.CreateRedisOperator()
}
20 changes: 20 additions & 0 deletions test/framework/framework.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package framework

import (
"github.com/PayU/Redis-Operator/controllers/rediscli"
"k8s.io/client-go/kubernetes"
)

type Framework struct {
KubeClient kubernetes.Clientset
RedisCLI rediscli.RedisCLI
}

func New() (*Framework, error) {
return &Framework{}, nil
}

// CreateRedisOperator creates a Redis Operator Kubernetes Deployment
func (f *Framework) CreateRedisOperator() error {
return nil
}