Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

split netpol cases #2322

Merged
merged 5 commits into from Feb 10, 2023
Merged

split netpol cases #2322

merged 5 commits into from Feb 10, 2023

Conversation

changluyi
Copy link
Collaborator

@changluyi changluyi commented Feb 10, 2023

What type of this PR

Examples of user facing changes:

  • Features
  • Bug fixes
  • Docs
  • Tests

Which issue(s) this PR fixes:

Fixes #2285

Comment on lines 365 to 366
k8s-netpol-e2e-legacy:
name: Kubernetes Network Policy E2E
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
k8s-netpol-e2e-legacy:
name: Kubernetes Network Policy E2E
k8s-netpol-legacy-e2e:
name: Kubernetes Network Policy Legacy E2E

Makefile.e2e Outdated
Comment on lines 8 to 9
K8S_NETPOL_E2E_SKIP_LEGACY = "sig-network.*NetworkPolicyLegacy"
K8S_NETPOL_E2E_SKIP_NETPOL = "sig-network.*Netpol"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
K8S_NETPOL_E2E_SKIP_LEGACY = "sig-network.*NetworkPolicyLegacy"
K8S_NETPOL_E2E_SKIP_NETPOL = "sig-network.*Netpol"
K8S_NETPOL_E2E_SKIP = "sig-network.*NetworkPolicyLegacy"
K8S_NETPOL_LEGACY_E2E_FOCUS = "sig-network.*NetworkPolicyLegacy"

Makefile.e2e Outdated
Comment on lines 52 to 57
.PHONY: k8s-netpol-e2e-legacy
k8s-netpol-e2e-legacy:
go test ./test/e2e/k8s-network -c -o test/e2e/k8s-network/e2e.test
./test/e2e/k8s-network/e2e.test --ginkgo.timeout=2h \
$(call ginkgo_option,focus,$(K8S_NETPOL_E2E_FOCUS)) \
$(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP_NETPOL))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.PHONY: k8s-netpol-e2e-legacy
k8s-netpol-e2e-legacy:
go test ./test/e2e/k8s-network -c -o test/e2e/k8s-network/e2e.test
./test/e2e/k8s-network/e2e.test --ginkgo.timeout=2h \
$(call ginkgo_option,focus,$(K8S_NETPOL_E2E_FOCUS)) \
$(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP_NETPOL))
.PHONY: k8s-netpol-legacy-e2e
k8s-netpol-legacy-e2e:
go test ./test/e2e/k8s-network -c -o test/e2e/k8s-network/e2e.test
./test/e2e/k8s-network/e2e.test --ginkgo.timeout=2h \
$(call ginkgo_option,focus,$(K8S_NETPOL_LEGACY_E2E_FOCUS))

Makefile.e2e Outdated
.PHONY: k8s-netpol-e2e
k8s-netpol-e2e:
go test ./test/e2e/k8s-network -c -o test/e2e/k8s-network/e2e.test
./test/e2e/k8s-network/e2e.test --ginkgo.timeout=2h \
$(call ginkgo_option,focus,$(K8S_NETPOL_E2E_FOCUS)) \
$(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP))
$(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP_LEGACY))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP_LEGACY))
$(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP))

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed all

@@ -362,6 +362,95 @@ jobs:
working-directory: ${{ env.E2E_DIR }}
run: make k8s-netpol-e2e

k8s-netpol-legacy-e2e:
name: Kubernetes Network Policy E2E
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name: Kubernetes Network Policy E2E
name: Kubernetes Network Policy Legacy E2E

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

finished

@@ -1064,6 +1153,7 @@ jobs:
- build-centos-compile
- k8s-conformance-e2e
- k8s-netpol-e2e
- k8s-netpol-e2e-legacy
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- k8s-netpol-e2e-legacy
- k8s-netpol-legacy-e2e

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for this small issue

@@ -1064,6 +1153,7 @@ jobs:
- build-centos-compile
- k8s-conformance-e2e
- k8s-netpol-e2e
- k8s-netpol-legacy-e2e
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- k8s-netpol-legacy-e2e
# - k8s-netpol-legacy-e2e

Some e2e cases failed, we should comment this until the failure is resolved.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@changluyi changluyi merged commit b2eaea0 into master Feb 10, 2023
@changluyi changluyi deleted the split_netpol_cases branch February 10, 2023 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

k8s network policy legacy e2e test fails
2 participants