move e2e dir under test dir

Signed-off-by: Yuji Ito <[email protected]>

.dockerignore

@@ -5,5 +5,5 @@ bin/
 charts/
 config/
 docs/
-e2e/
+test/
 testbin/

.github/workflows/e2e.yaml

@@ -25,5 +25,5 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
-      - run: make -C e2e create-cluster
-      - run: make -C e2e test
+      - run: make -C test/e2e create-cluster
+      - run: make -C test/e2e test

.gitignore

@@ -28,4 +28,4 @@ testbin/*
 pie
 !pie/
 
-e2e/.kubeconfig
+test/e2e/.kubeconfig

README.md

@@ -62,6 +62,6 @@ TYPE: counter
 
 2. Run e2e test on the local cluster.
     ```sh
-    make -C e2e create-cluster
-    make -C e2e test
+    make -C test/e2e create-cluster
+    make -C test/e2e test
     ```

e2e/Makefile → test/e2e/Makefile

@@ -1,4 +1,4 @@
-include ../versions.mk
+include ../../versions.mk
 
 PROJECT_ROOT := $(shell git rev-parse --show-toplevel)
 BINDIR := $(PROJECT_ROOT)/bin
@@ -12,10 +12,10 @@ KIND_CLUSTER_NAME := pie-test
 .PHONY: create-cluster
 create-cluster: $(KIND) $(HELM)
 	$(KIND) create cluster --name $(KIND_CLUSTER_NAME) --image $(KIND_NODE_VERSION)
-	$(MAKE) -C ../ docker-build IMG=pie:dev
+	$(MAKE) -C ../../ docker-build IMG=pie:dev
 	$(KIND) load docker-image pie:dev --name $(KIND_CLUSTER_NAME)
 	$(MAKE) $(KUBECONFIG)
-	KUBECONFIG=$(KUBECONFIG) $(HELM) install --create-namespace -n e2e pie ../charts/pie/ -f values.yaml
+	KUBECONFIG=$(KUBECONFIG) $(HELM) install --create-namespace -n e2e pie ../../charts/pie/ -f values.yaml
 
 .PHONY: test
 test: $(KUBECONFIG)

e2e/suite_test.go → test/e2e/suite_test.go

@@ -57,7 +57,7 @@ func kubectlWithInput(input []byte, args ...string) ([]byte, []byte, error) {
 
 func TestMtest(t *testing.T) {
 	if os.Getenv("E2ETEST") == "" {
-		t.Skip("Run under e2e/")
+		t.Skip("Run under test/e2e/")
 		return
 	}