diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 2f3935ad7a6..75d8b384eab 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -1104,17 +1104,13 @@ jobs: sudo cp -r /root/.kube/ ~/.kube/ sudo chown -R $(id -un). ~/.kube/ - - name: Install Multus - run: make kind-install-multus - - - name: Install Kube-OVN + - name: Install Multus and Kube-OVN run: make kind-install-lb-svc - name: Run E2E working-directory: ${{ env.E2E_DIR }} run: make kube-ovn-lb-svc-conformance-e2e - kubevirt-e2e: name: Kubevirt vm E2E needs: diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index 071ebde387e..4a4e94761d9 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -739,11 +739,7 @@ jobs: sudo cp -r /root/.kube/ ~/.kube/ sudo chown -R $(id -un). ~/.kube/ - - name: Install Multus - working-directory: test/e2e/kube-ovn/branches/${{ matrix.branch }} - run: make kind-install-multus - - - name: Install Kube-OVN + - name: Install Multus and Kube-OVN working-directory: test/e2e/kube-ovn/branches/${{ matrix.branch }} run: | version=$(grep -E '^VERSION="v([0-9]+\.){2}[0-9]+"$' dist/images/install.sh | head -n1 | awk -F= '{print $2}' | tr -d '"') diff --git a/Makefile b/Makefile index e58b3f2c52a..c1139b05574 100644 --- a/Makefile +++ b/Makefile @@ -617,10 +617,9 @@ kind-install-kubevirt: kind-load-image kind-untaint-control-plane .PHONY: kind-install-lb-svc kind-install-lb-svc: kind-load-image kind-untaint-control-plane $(call kind_load_image,kube-ovn,$(VPC_NAT_GW_IMG)) + @$(MAKE) ENABLE_LB_SVC=true CNI_CONFIG_PRIORITY=10 kind-install + @$(MAKE) kind-install-multus kubectl apply -f yamls/lb-svc-attachment.yaml - sed 's/VERSION=.*/VERSION=$(VERSION)/' dist/images/install.sh | \ - ENABLE_LB_SVC=true CNI_CONFIG_PRIORITY=10 bash - kubectl describe no .PHONY: kind-install-webhook kind-install-webhook: kind-install