From a757ee662f4f2b41a6f6d0b0794f014b31fd1ab1 Mon Sep 17 00:00:00 2001 From: "tao.yang" Date: Fri, 8 Dec 2023 11:29:58 +0800 Subject: [PATCH] e2e-fix: Use the default calico version when getting the calico version fails Signed-off-by: tao.yang --- test/Makefile.defs | 1 + test/scripts/install-default-cni.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/Makefile.defs b/test/Makefile.defs index c64f47ecee..2277cd250b 100644 --- a/test/Makefile.defs +++ b/test/Makefile.defs @@ -130,6 +130,7 @@ E2E_MULTUS_IMAGE_NAME ?= $(E2E_MULTUS_IMAGE_REGISTER)/k8snetworkplumbingwg/multu #================= calico CALICO_VERSION ?= +DEFAULT_CALICO_VERSION ?= v3.26.4 ifeq ($(E2E_CHINA_IMAGE_REGISTRY),true) CALICO_IMAGE_REPO ?= docker.m.daocloud.io diff --git a/test/scripts/install-default-cni.sh b/test/scripts/install-default-cni.sh index 725c612d80..8178cfedd7 100755 --- a/test/scripts/install-default-cni.sh +++ b/test/scripts/install-default-cni.sh @@ -56,9 +56,9 @@ CILIUM_CLUSTER_POD_SUBNET_V6=${CILIUM_CLUSTER_POD_SUBNET_V6:-"fd00:10:244::/112" function install_calico() { cp ${PROJECT_ROOT_PATH}/test/yamls/calico.yaml $CLUSTER_PATH/calico.yaml if [ -z "${CALICO_VERSION}" ]; then - [ -n "${HTTP_PROXY}" ] && CALICO_VERSION=$(curl --retry 3 -x "${HTTP_PROXY}" -s https://api.github.com/repos/projectcalico/calico/releases/latest | jq -r '.tag_name') - [ -z "${HTTP_PROXY}" ] && CALICO_VERSION=$(curl --retry 3 -s https://api.github.com/repos/projectcalico/calico/releases/latest | jq -r '.tag_name') - [ "${CALICO_VERSION}" == "null" ] && { echo "failed get calico version"; exit 1; } + [ -n "${HTTP_PROXY}" ] && { CALICO_VERSION_INFO=$(curl --retry 3 --retry-delay 5 -x "${HTTP_PROXY}" -s https://api.github.com/repos/projectcalico/calico/releases/latest); echo ${CALICO_VERSION_INFO}; CALICO_VERSION=$(echo ${CALICO_VERSION_INFO} | jq -r '.tag_name'); } + [ -z "${HTTP_PROXY}" ] && { CALICO_VERSION_INFO=$(curl --retry 3 --retry-delay 5 -s https://api.github.com/repos/projectcalico/calico/releases/latest ); echo ${CALICO_VERSION_INFO}; CALICO_VERSION=$(echo ${CALICO_VERSION_INFO} | jq -r '.tag_name'); } + [ "${CALICO_VERSION}" == "null" ] && { echo "failed to get the calico version, will try to use default version."; CALICO_VERSION=${DEFAULT_CALICO_VERSION}; } else CALICO_VERSION=${CALICO_VERSION} fi