From 00bfa4bd8dc071b37cfa08e22ff21a68d69964ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Thu, 17 Aug 2023 15:18:12 +0800 Subject: [PATCH] base: remove ovn patch for skipping ct (#3141) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * base: remove ovn patch for skipping ct * add gdb to base image * ci: run k8s network policy e2e in series --------- Signed-off-by: 张祖建 --- .github/workflows/build-x86-image.yaml | 2 +- .github/workflows/scheduled-e2e.yaml | 2 +- Makefile.e2e | 2 +- dist/images/Dockerfile.base | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 113db70ac89..718ab0c6149 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -428,7 +428,7 @@ jobs: - build-e2e-binaries - netpol-path-filter runs-on: ubuntu-22.04 - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index e25e3ec1dc0..3f75593b9fb 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -108,7 +108,7 @@ jobs: k8s-netpol-e2e: name: Kubernetes Network Policy E2E runs-on: ubuntu-22.04 - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: diff --git a/Makefile.e2e b/Makefile.e2e index 35cd483761d..afa0c08ec58 100644 --- a/Makefile.e2e +++ b/Makefile.e2e @@ -86,7 +86,7 @@ k8s-netpol-legacy-e2e: .PHONY: k8s-netpol-e2e k8s-netpol-e2e: ginkgo build $(E2E_BUILD_FLAGS) ./test/e2e/k8s-network - ginkgo -p --randomize-all -v --timeout=2h \ + ginkgo --randomize-all -v --timeout=2h \ $(call ginkgo_option,focus,$(K8S_NETPOL_E2E_FOCUS)) \ $(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP)) \ ./test/e2e/k8s-network/k8s-network.test diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index d9ade2422bb..d459bd8b381 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -29,8 +29,6 @@ RUN cd /usr/src/ && \ RUN cd /usr/src/ && git clone -b branch-22.12 --depth=1 https://github.com/ovn-org/ovn.git && \ cd ovn && \ - # do not send direct traffic between lports to conntrack - curl -s https://github.com/kubeovn/ovn/commit/4124fb623183541b80a577846ce145c7faf8eb5d.patch | git apply && \ # change hash type from dp_hash to hash with field src_ip curl -s https://github.com/kubeovn/ovn/commit/daa09e380eec61620d4ee317e3265c44366d1147.patch | git apply && \ # set ether dst addr for dnat on logical switch @@ -111,7 +109,7 @@ RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \ ARG DEBUG=false RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \ if [ "${DEBUG}" = "true" ]; then \ - apt update && apt install -y --no-install-recommends valgrind && \ + apt update && apt install -y --no-install-recommends gdb valgrind && \ rm -rf /var/lib/apt/lists/* && \ dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/*.ddeb; \ fi