test: decrease ginkgo nodes to 1 to reduce flakiness (#297)
Signed-off-by: GitHub <noreply@github.com>
This commit is contained in:
Родитель
1215a32ef1
Коммит
9a475482e0
|
@ -19,7 +19,7 @@ jobs:
|
|||
steps:
|
||||
- template: templates/scan-images.yaml
|
||||
- job: lint
|
||||
timeoutInMinutes: 15
|
||||
timeoutInMinutes: 30
|
||||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
|
@ -61,7 +61,6 @@ jobs:
|
|||
- lint
|
||||
- scan_images
|
||||
- shellcheck
|
||||
- unit_test
|
||||
workspace:
|
||||
clean: all
|
||||
variables:
|
||||
|
|
4
Makefile
4
Makefile
|
@ -53,7 +53,7 @@ KUSTOMIZE_VER := v4.1.2
|
|||
KUSTOMIZE_BIN := kustomize
|
||||
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
|
||||
|
||||
GOLANGCI_LINT_VER := v1.41.1
|
||||
GOLANGCI_LINT_VER := v1.43.0
|
||||
GOLANGCI_LINT_BIN := golangci-lint
|
||||
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
|
||||
|
||||
|
@ -308,7 +308,7 @@ $(E2E_TEST):
|
|||
# Ginkgo configurations
|
||||
GINKGO_FOCUS ?=
|
||||
GINKGO_SKIP ?=
|
||||
GINKGO_NODES ?= 3
|
||||
GINKGO_NODES ?= 1
|
||||
GINKGO_NO_COLOR ?= false
|
||||
GINKGO_TIMEOUT ?= 5m
|
||||
GINKGO_ARGS ?= -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" -nodes=$(GINKGO_NODES) -noColor=$(GINKGO_NO_COLOR) -timeout=$(GINKGO_TIMEOUT)
|
||||
|
|
|
@ -47,7 +47,7 @@ main() {
|
|||
--enable-managed-identity \
|
||||
--network-plugin azure \
|
||||
--kubernetes-version "${KUBERNETES_VERSION}" \
|
||||
--node-count 1 \
|
||||
--node-count 3 \
|
||||
--generate-ssh-keys > /dev/null
|
||||
if [[ "${WINDOWS_CLUSTER:-}" == "true" ]]; then
|
||||
if [[ "${WINDOWS_CONTAINERD:-}" == "true" ]]; then
|
||||
|
@ -57,7 +57,7 @@ main() {
|
|||
EXTRA_ARGS="--aks-custom-headers WindowsContainerRuntime=containerd"
|
||||
fi
|
||||
# shellcheck disable=SC2086
|
||||
az aks nodepool add --resource-group "${CLUSTER_NAME}" --cluster-name "${CLUSTER_NAME}" --os-type Windows --name npwin --kubernetes-version "${KUBERNETES_VERSION}" --node-count 1 ${EXTRA_ARGS:-} > /dev/null
|
||||
az aks nodepool add --resource-group "${CLUSTER_NAME}" --cluster-name "${CLUSTER_NAME}" --os-type Windows --name npwin --kubernetes-version "${KUBERNETES_VERSION}" --node-count 3 ${EXTRA_ARGS:-} > /dev/null
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -68,6 +68,13 @@ nodes:
|
|||
- hostPath: ${SERVICE_ACCOUNT_SIGNING_KEY_FILE}
|
||||
containerPath: /etc/kubernetes/pki/sa.key
|
||||
kubeadmConfigPatches:
|
||||
- |
|
||||
kind: InitConfiguration
|
||||
nodeRegistration:
|
||||
taints:
|
||||
- key: "kubeadmNode"
|
||||
value: "master"
|
||||
effect: "NoSchedule"
|
||||
- |
|
||||
kind: ClusterConfiguration
|
||||
apiServer:
|
||||
|
@ -78,6 +85,9 @@ nodes:
|
|||
controllerManager:
|
||||
extraArgs:
|
||||
service-account-private-key-file: /etc/kubernetes/pki/sa.key
|
||||
- role: worker
|
||||
- role: worker
|
||||
- role: worker
|
||||
EOF
|
||||
|
||||
${KUBECTL} wait node "${KIND_CLUSTER_NAME}-control-plane" --for=condition=Ready --timeout=90s
|
||||
|
|
Загрузка…
Ссылка в новой задаче