This is an automated email from the ASF dual-hosted git repository.

mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 17f1d2dde76e3c14c4c414b3ce38ec375d981f24
Author: Matthias Pohl <[email protected]>
AuthorDate: Fri Jul 21 14:30:24 2023 +0200

    [hotfix][test] Introduces local variables for cri-dockerd version
    
    Signed-off-by: Matthias Pohl <[email protected]>
---
 flink-end-to-end-tests/test-scripts/common_kubernetes.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh 
b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
index 5bac2119932..d37022a6f50 100755
--- a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
+++ b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh
@@ -57,18 +57,22 @@ function setup_kubernetes_for_linux {
     # conntrack is required for minikube 1.9 and later
     sudo apt-get install conntrack
     # crictl is required for cri-dockerd
-    VERSION="v1.24.2"
-    wget -nv 
https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz
-    sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
-    rm -f crictl-$VERSION-linux-amd64.tar.gz
+    local crictl_version crictl_archive
+    crictl_version="v1.24.2"
+    crictl_archive="crictl-$crictl_version-linux-amd64.tar.gz"
+    wget -nv 
"https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictl_version}/crictl-${crictl_version}-linux-amd64.tar.gz";
+    sudo tar zxvf ${crictl_archive} -C /usr/local/bin
+    rm -f ${crictl_archive}
+
     # cri-dockerd is required to use Kubernetes 1.24+ and the none driver
+    local cri_dockerd_version
+    cri_dockerd_version="v0.2.3"
     if [ -e cri-dockerd ];
      then rm -r cri-dockerd
     fi
     git clone https://github.com/Mirantis/cri-dockerd.git
     cd cri-dockerd
-    # Checkout version 0.2.3
-    git checkout tags/v0.2.3 -b v0.2.3
+    git checkout tags/${cri_dockerd_version} -b ${cri_dockerd_version}
     mkdir bin
     go get && go build -o bin/cri-dockerd
     mkdir -p /usr/local/bin

Reply via email to