Skip to content

Commit

Permalink
refactor: e2e infras (#407)
Browse files Browse the repository at this point in the history 
Signed-off-by: bitliu <[email protected]>
  • Loading branch information
@Xunzhuo
Xunzhuo committed Jun 30, 2023
1 parent 81e467b commit 3fd37ab
Show file tree
Hide file tree
Showing 73 changed files with 324 additions and 445 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
steps:
- uses: actions/checkout@v3

ingress-conformance-test:
higress-conformance-test:
runs-on: ubuntu-latest
needs: [build]
steps:
Expand Down Expand Up @@ -141,10 +141,10 @@ jobs:

- run: git stash # restore patch

- name: "Run Ingress Conformance Tests"
run: GOPROXY="https://proxy.golang.org,direct" make ingress-conformance-test
- name: "Run Higress E2E Conformance Tests"
run: GOPROXY="https://proxy.golang.org,direct" make higress-conformance-test

ingress-wasmplugin-test:
higress-wasmplugin-test:
runs-on: ubuntu-latest
needs: [build]
steps:
Expand Down Expand Up @@ -179,10 +179,10 @@ jobs:
- run: git stash # restore patch

- name: "Run Ingress WasmPlugins Tests"
run: GOPROXY="https://proxy.golang.org,direct" make ingress-wasmplugin-test
run: GOPROXY="https://proxy.golang.org,direct" make higress-wasmplugin-test

publish:
runs-on: ubuntu-latest
needs: [ingress-conformance-test,gateway-conformance-test,ingress-wasmplugin-test]
needs: [higress-conformance-test,gateway-conformance-test,higress-wasmplugin-test]
steps:
- uses: actions/checkout@v3
28 changes: 14 additions & 14 deletions Makefile.core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,13 @@ include tools/lint.mk
.PHONY: gateway-conformance-test
gateway-conformance-test:

# ingress-conformance-test runs ingress api conformance tests.
.PHONY: ingress-conformance-test
ingress-conformance-test: $(tools/kind) delete-cluster create-cluster docker-build kube-load-image install-dev run-ingress-e2e-test delete-cluster
# higress-conformance-test runs ingress api conformance tests.
.PHONY: higress-conformance-test
higress-conformance-test: $(tools/kind) delete-cluster create-cluster docker-build kube-load-image install-dev run-higress-e2e-test delete-cluster

# ingress-wasmplugin-test runs ingress wasmplugin tests.
.PHONY: ingress-wasmplugin-test
ingress-wasmplugin-test: $(tools/kind) delete-cluster create-cluster docker-build kube-load-image install-dev-wasmplugin run-ingress-e2e-test-wasmplugin delete-cluster
# higress-wasmplugin-test runs ingress wasmplugin tests.
.PHONY: higress-wasmplugin-test
higress-wasmplugin-test: $(tools/kind) delete-cluster create-cluster docker-build kube-load-image install-dev-wasmplugin run-higress-e2e-test-wasmplugin delete-cluster

# create-cluster creates a kube cluster with kind.
.PHONY: create-cluster
Expand All @@ -229,22 +229,22 @@ kube-load-image: $(tools/kind) ## Install the Higress image to a kind cluster us
tools/hack/kind-load-image.sh registry.cn-hangzhou.aliyuncs.com/hinsteny/dubbo-provider-demo 0.0.1
tools/hack/kind-load-image.sh registry.cn-hangzhou.aliyuncs.com/hinsteny/nacos-standlone-rc3 1.0.0-RC3

# run-ingress-e2e-test starts to run ingress e2e tests.
.PHONY: run-ingress-e2e-test
run-ingress-e2e-test:
# run-higress-e2e-test starts to run ingress e2e tests.
.PHONY: run-higress-e2e-test
run-higress-e2e-test:
@echo -e "\n\033[36mRunning higress conformance tests...\033[0m"
@echo -e "\n\033[36mWaiting higress-controller to be ready...\033[0m\n"
kubectl wait --timeout=10m -n higress-system deployment/higress-controller --for=condition=Available
@echo -e "\n\033[36mWaiting higress-gateway to be ready...\033[0m\n"
kubectl wait --timeout=10m -n higress-system deployment/higress-gateway --for=condition=Available
go test -v -tags conformance ./test/ingress/e2e_test.go --ingress-class=higress --debug=true
go test -v -tags conformance ./test/e2e/e2e_test.go --ingress-class=higress --debug=true

# run-ingress-e2e-test starts to run ingress e2e tests.
.PHONY: run-ingress-e2e-test-wasmplugin
run-ingress-e2e-test-wasmplugin:
# run-higress-e2e-test starts to run ingress e2e tests.
.PHONY: run-higress-e2e-test-wasmplugin
run-higress-e2e-test-wasmplugin:
@echo -e "\n\033[36mRunning higress conformance tests...\033[0m"
@echo -e "\n\033[36mWaiting higress-controller to be ready...\033[0m\n"
kubectl wait --timeout=10m -n higress-system deployment/higress-controller --for=condition=Available
@echo -e "\n\033[36mWaiting higress-gateway to be ready...\033[0m\n"
kubectl wait --timeout=10m -n higress-system deployment/higress-gateway --for=condition=Available
go test -v -tags conformance ./test/ingress/e2e_test.go -isWasmPluginTest=true --ingress-class=higress --debug=true
go test -v -tags conformance ./test/e2e/e2e_test.go -isWasmPluginTest=true --ingress-class=higress --debug=true
0 test/ingress/arch.png → test/e2e/arch.png
View file
File renamed without changes
0 test/ingress/conformance/base/manifests.yaml → test/e2e/conformance/base/manifests.yaml
View file
File renamed without changes.
0 test/ingress/conformance/embed.go → test/e2e/conformance/embed.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...s/conformance/tests/httproute-app-root.go → ...e/conformance/tests/httproute-app-root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...conformance/tests/httproute-app-root.yaml → ...conformance/tests/httproute-app-root.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...e-canary-header-with-customized-header.go → ...e-canary-header-with-customized-header.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...canary-header-with-customized-header.yaml → ...canary-header-with-customized-header.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...formance/tests/httproute-canary-header.go → ...formance/tests/httproute-canary-header.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...rmance/tests/httproute-canary-header.yaml → ...rmance/tests/httproute-canary-header.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...formance/tests/httproute-canary-weight.go → ...formance/tests/httproute-canary-weight.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...rmance/tests/httproute-canary-weight.yaml → ...rmance/tests/httproute-canary-weight.yaml
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions .../tests/httproute-downstream-encryption.go → .../tests/httproute-downstream-encryption.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (

"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/alibaba/higress/test/ingress/conformance/utils/cert"
"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/kubernetes"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/cert"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/kubernetes"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ests/httproute-downstream-encryption.yaml → ...ests/httproute-downstream-encryption.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...onformance/tests/httproute-enable-cors.go → ...onformance/tests/httproute-enable-cors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...formance/tests/httproute-enable-cors.yaml → ...formance/tests/httproute-enable-cors.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nce/tests/httproute-enable-ignore-case.go → ...nce/tests/httproute-enable-ignore-case.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...e/tests/httproute-enable-ignore-case.yaml → ...e/tests/httproute-enable-ignore-case.yaml
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...e/tests/httproute-force-redirect-https.go → ...e/tests/httproute-force-redirect-https.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...tests/httproute-force-redirect-https.yaml → ...tests/httproute-force-redirect-https.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rmance/tests/httproute-full-path-regex.go → ...rmance/tests/httproute-full-path-regex.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ance/tests/httproute-full-path-regex.yaml → ...ance/tests/httproute-full-path-regex.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ests/httproute-hostname-same-namespace.go → ...ests/httproute-hostname-same-namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ts/httproute-hostname-same-namespace.yaml → ...ts/httproute-hostname-same-namespace.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...s/conformance/tests/httproute-http2rpc.go → ...e/conformance/tests/httproute-http2rpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...conformance/tests/httproute-http2rpc.yaml → ...conformance/tests/httproute-http2rpc.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...formance/tests/httproute-match-headers.go → ...formance/tests/httproute-match-headers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...rmance/tests/httproute-match-headers.yaml → ...rmance/tests/httproute-match-headers.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...formance/tests/httproute-match-methods.go → ...formance/tests/httproute-match-methods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...rmance/tests/httproute-match-methods.yaml → ...rmance/tests/httproute-match-methods.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...conformance/tests/httproute-match-path.go → ...conformance/tests/httproute-match-path.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...nformance/tests/httproute-match-path.yaml → ...nformance/tests/httproute-match-path.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nce/tests/httproute-match-query-params.go → ...nce/tests/httproute-match-query-params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...e/tests/httproute-match-query-params.yaml → ...e/tests/httproute-match-query-params.yaml
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ests/httproute-permanent-redirect-code.go → ...ests/httproute-permanent-redirect-code.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ts/httproute-permanent-redirect-code.yaml → ...ts/httproute-permanent-redirect-code.yaml
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...nce/tests/httproute-permanent-redirect.go → ...nce/tests/httproute-permanent-redirect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...e/tests/httproute-permanent-redirect.yaml → ...e/tests/httproute-permanent-redirect.yaml
View file
File renamed without changes.
0 ...nce/tests/httproute-redirct-as-https.yaml → ...nce/tests/httproute-redirct-as-https.yaml
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ance/tests/httproute-redirect-as-https.go → ...ance/tests/httproute-redirect-as-https.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions ...tests/httproute-request-header-control.go → ...tests/httproute-request-header-control.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...sts/httproute-request-header-control.yaml → ...sts/httproute-request-header-control.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nformance/tests/httproute-rewrite-host.go → ...nformance/tests/httproute-rewrite-host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ormance/tests/httproute-rewrite-host.yaml → ...ormance/tests/httproute-rewrite-host.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nformance/tests/httproute-rewrite-path.go → ...nformance/tests/httproute-rewrite-path.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ormance/tests/httproute-rewrite-path.yaml → ...ormance/tests/httproute-rewrite-path.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nce/tests/httproute-same-host-and-path.go → ...nce/tests/httproute-same-host-and-path.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...e/tests/httproute-same-host-and-path.yaml → ...e/tests/httproute-same-host-and-path.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions .../tests/httproute-simple-same-namespace.go → .../tests/httproute-simple-same-namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ests/httproute-simple-same-namespace.yaml → ...ests/httproute-simple-same-namespace.yaml
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ance/tests/httproute-temporal-redirect.go → ...ance/tests/httproute-temporal-redirect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/roundtripper"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ce/tests/httproute-temporal-redirect.yaml → ...ce/tests/httproute-temporal-redirect.yaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tests/httproute-whitelist-source-range.go → ...tests/httproute-whitelist-source-range.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...sts/httproute-whitelist-source-range.yaml → ...sts/httproute-whitelist-source-range.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion test/ingress/conformance/tests/main.go → test/e2e/conformance/tests/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

package tests

import "github.com/alibaba/higress/test/ingress/conformance/utils/suite"
import "github.com/alibaba/higress/test/e2e/conformance/utils/suite"

var HigressConformanceTests []suite.ConformanceTest
4 changes: 2 additions & 2 deletions ...ngress/conformance/tests/request-block.go → test/e2e/conformance/tests/request-block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package tests
import (
"testing"

"github.com/alibaba/higress/test/ingress/conformance/utils/http"
"github.com/alibaba/higress/test/ingress/conformance/utils/suite"
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
)

func init() {
Expand Down
0 ...ress/conformance/tests/request-block.yaml → .../e2e/conformance/tests/request-block.yaml
View file
File renamed without changes.
Loading

0 comments on commit 3fd37ab

Please sign in to comment.