Skip to content

Commit

Permalink
[automated] Update cpu Builder image changes
Browse files Browse the repository at this point in the history
Signed-off-by: Liang Huang <[email protected]>
  • Loading branch information
yellow-shine committed Jun 24, 2024
1 parent b77ab76 commit 06bf878
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;"

10 changes: 5 additions & 5 deletions .github/workflows/code-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand All @@ -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:
Expand All @@ -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"
11 changes: 5 additions & 6 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -93,7 +92,7 @@ jobs:
- name: Download Caches
uses: ./.github/actions/cache
with:
os: 'ubuntu20.04'
os: 'ubuntu22.04'
kind: 'cpp'
- name: Build
run: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/e2e-k8s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit 06bf878

Please sign in to comment.