From 2cc9df5c50de85a03b501fa6734486797388415f Mon Sep 17 00:00:00 2001
From: "sammy.huang" <sammy.huang@zilliz.com>
Date: Tue, 25 Jun 2024 10:56:10 +0800
Subject: [PATCH] [automated] Update cpu Builder image changes (#34078)

Signed-off-by: Liang Huang <sammy.huang@zilliz.com>
---
 .env                                            |  8 ++++----
 .github/workflows/code-checker.yaml             | 10 +++++-----
 .github/workflows/main.yaml                     | 11 +++++------
 build/docker/builder/cpu/ubuntu22.04/Dockerfile |  3 ++-
 tests/scripts/e2e-k8s.sh                        |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.env b/.env
index 6beb24525c..e00b705a83 100644
--- a/.env
+++ b/.env
@@ -2,12 +2,11 @@
 
 IMAGE_REPO=milvusdb
 IMAGE_ARCH=amd64
-OS_NAME=ubuntu20.04
+OS_NAME=ubuntu22.04
 
 # for services.builder.image in docker-compose.yml
-DATE_VERSION=20240520-d27db99
-LATEST_DATE_VERSION=20240520-d27db99
-
+DATE_VERSION=20240620-5be9929
+LATEST_DATE_VERSION=20240620-5be9929
 # for services.gpubuilder.image in docker-compose.yml
 GPU_DATE_VERSION=20240520-c35eaaa
 LATEST_GPU_DATE_VERSION=20240520-c35eaaa
@@ -17,3 +16,4 @@ MINIO_ADDRESS=minio:9000
 PULSAR_ADDRESS=pulsar://pulsar:6650
 ETCD_ENDPOINTS=etcd:2379
 AZURITE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;"
+
diff --git a/.github/workflows/code-checker.yaml b/.github/workflows/code-checker.yaml
index 659680126d..0f49d40b93 100644
--- a/.github/workflows/code-checker.yaml
+++ b/.github/workflows/code-checker.yaml
@@ -34,7 +34,7 @@ concurrency:
 
 jobs:
   ubuntu:
-    name: Code Checker AMD64 Ubuntu 20.04
+    name: Code Checker AMD64 Ubuntu 22.04
     runs-on: ubuntu-latest
     timeout-minutes: 180
     strategy:
@@ -54,10 +54,10 @@ jobs:
       - name: Download Caches
         uses: ./.github/actions/cache
         with:
-          os: 'ubuntu20.04'
+          os: 'ubuntu22.04'
       - name: Code Check
         env:
-          OS_NAME: 'ubuntu20.04'
+          OS_NAME: 'ubuntu22.04'
         run: |
           ./build/builder.sh /bin/bash -c "make check-proto-product && make verifiers"
 
@@ -84,7 +84,7 @@ jobs:
           os: 'amazonlinux2023'
       - name: Code Check
         run: |
-          sed -i 's/ubuntu20.04/amazonlinux2023/g' .env
+          sed -i 's/ubuntu22.04/amazonlinux2023/g' .env
           ./build/builder.sh /bin/bash -c "make install"
 
   rockylinux:
@@ -110,5 +110,5 @@ jobs:
           os: 'rockylinux8'
       - name: Code Check
         run: |
-          sed -i 's/ubuntu20.04/rockylinux8/g' .env
+          sed -i 's/ubuntu22.04/rockylinux8/g' .env
           ./build/builder.sh /bin/bash -c "make install"
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b2a965cbda..5885d8f92a 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -43,9 +43,8 @@ concurrency:
 
 jobs:
   Build:
-    name: Build and test AMD64 Ubuntu 20.04
+    name: Build and test AMD64 Ubuntu 22.04
     runs-on: ubuntu-latest
-    timeout-minutes: 180
     steps:
       - name: 'Setup $HOME'
         # hot fix
@@ -93,7 +92,7 @@ jobs:
       - name: Download Caches
         uses: ./.github/actions/cache
         with:
-          os: 'ubuntu20.04'
+          os: 'ubuntu22.04'
           kind: 'cpp'
       - name: Build
         run: |
@@ -130,7 +129,7 @@ jobs:
       - name: Download Caches
         uses: ./.github/actions/cache
         with:
-          os: 'ubuntu20.04'
+          os: 'ubuntu22.04'
           kind: 'cpp'
       - name: Start Service
         shell: bash
@@ -176,7 +175,7 @@ jobs:
       - name: Download Caches
         uses: ./.github/actions/cache
         with:
-          os: 'ubuntu20.04'
+          os: 'ubuntu22.04'
           kind: 'go'
       - name: Start Service
         shell: bash
@@ -221,7 +220,7 @@ jobs:
       - name: Download Caches
         uses: ./.github/actions/cache
         with:
-          os: 'ubuntu20.04'
+          os: 'ubuntu22.04'
           kind: 'go'
       - name: Start Service
         shell: bash
diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile
index bef41afff3..be108908ca 100644
--- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile
+++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile
@@ -23,7 +23,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
 # upgrade gcc to 12
 RUN apt-get update && apt-get install -y gcc-12 g++-12 && cd /usr/bin \
     && unlink gcc && ln -s gcc-12 gcc \
-    && unlink g++ && ln -s g++-12 g++
+    && unlink g++ && ln -s g++-12 g++ \
+    && unlink gcov && ln -s gcov-12 gcov
 
 RUN pip3 install conan==1.61.0
 
diff --git a/tests/scripts/e2e-k8s.sh b/tests/scripts/e2e-k8s.sh
index 3baf00a7b8..88893b2a42 100755
--- a/tests/scripts/e2e-k8s.sh
+++ b/tests/scripts/e2e-k8s.sh
@@ -209,7 +209,7 @@ if [[ -n "${GPU_BUILD:-}" ]]; then
   export TAG="${TAG:-gpu-latest}"
   export MODE="gpu"
 else
-  export BUILD_COMMAND="${BUILD_COMMAND:-make install}"
+  export BUILD_COMMAND="${BUILD_COMMAND:-make install use_disk_index=ON}"
   export BUILD_SCRIPT="builder.sh"
   export BUILD_IMAGE_SCRIPT="build_image.sh"
   export TAG="${TAG:-latest}"