milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[skip e2e]Move milvus-dev to milvus (#17941) 

Signed-off-by: Jenny Li <jing.li@zilliz.com>
pull/17955/head
Jenny Li 2022-06-30 15:20:22 +08:00 committed by GitHub
parent b32ff76696
commit 4ac5ebc9f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/daily-release.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
env:
IMAGE_REPO: "milvusdb"
DEV: "milvus-dev"
DEV: "milvus"
DAILY: "daily-build"
TAG_PREFIX: "master-"
steps:
@ -34,7 +34,7 @@ jobs:
run: echo "tag=$(./docker_image_find_tag.sh -n ${IMAGE_REPO}/${DEV} -t ${TAG_PREFIX}latest -f ${TAG_PREFIX} -F -L -q)" >> $GITHUB_ENV
- name: Pull latest milvus-dev image with tag prefix master-
- name: Pull latest milvus image with tag prefix master-
run: |
docker pull "${IMAGE_REPO}/${DEV}:${{ env.tag }}"
docker tag "${IMAGE_REPO}/${DEV}:${{ env.tag }}" "${IMAGE_REPO}/${DAILY}:${{ env.tag }}"

6
.github/workflows/deploy-test.yaml vendored
View File

@ -21,7 +21,7 @@ on:
new_image_repo:
description: The image repository name to use for the deploy test
required: true
default: 'milvusdb/milvus-dev'
default: 'milvusdb/milvus'
new_image_tag:
description: The new image tag to use for the deploy test
@ -57,7 +57,7 @@ jobs:
DEFAULT_OLD_IMAGE_REPO: "milvusdb/milvus"
DEFAULT_OLD_IMAGE_TAG: "latest"
DEFAULT_PREVIOUS_RELEASE_VERSION: "v2.0.2"
DEFAULT_NEW_IMAGE_REPO: "milvusdb/milvus-dev"
DEFAULT_NEW_IMAGE_REPO: "milvusdb/milvus"
DEFAULT_NEW_IMAGE_TAG: "master-latest"
run: |
echo "OLD_IMAGE_REPO=${{ github.event.inputs.old_image_repo || env.DEFAULT_OLD_IMAGE_REPO }}" >> $GITHUB_ENV
@ -240,7 +240,7 @@ jobs:
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update
# if the task is reinstall, install milvus with latest image in repo milvusdb/milvus-dev
# if the task is reinstall, install milvus with latest image in repo milvusdb/milvus
# for cluster mode
if [ ${{ matrix.task }} == "reinstall" ] && [ ${{ matrix.mode }} == "cluster" ]; then
echo "task: ${{ matrix.task }} mode: ${{ matrix.mode }}";

2
.github/workflows/io-latency-chaos-test.yaml vendored
View File

@ -63,7 +63,7 @@ jobs:
working-directory: tests/python_client/chaos
run: |
echo "latest tag:"
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update
if [[ ${{ matrix.pod }} != *"standalone"* ]]; then helm install --wait --timeout 720s ${{ env.RELEASE }} milvus/milvus -f cluster-values.yaml -n=chaos-testing; fi

2
.github/workflows/mem-stress-chaos-test.yaml vendored
View File

@ -63,7 +63,7 @@ jobs:
working-directory: tests/python_client/chaos
run: |
echo "latest tag:"
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update
if [[ ${{ matrix.pod }} != *"standalone"* ]]; then helm install --wait --timeout 720s ${{ env.RELEASE }} milvus/milvus -f cluster-values.yaml -n=chaos-testing; fi

2
.github/workflows/network-latency-chaos-test.yaml vendored
View File

@ -63,7 +63,7 @@ jobs:
working-directory: tests/python_client/chaos
run: |
echo "latest tag:"
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update
if [[ ${{ matrix.pod }} != *"standalone"* ]]; then helm install --wait --timeout 720s ${{ env.RELEASE }} milvus/milvus -f cluster-values.yaml -n=chaos-testing; fi

2
.github/workflows/network-partition-chaos-test.yaml vendored
View File

@ -58,7 +58,7 @@ jobs:
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update
# install milvus with latest image
helm install --wait --timeout 360s chaos-testing milvus/milvus --set cluster.enabled=true --set image.all.repository=milvusdb/milvus-dev --set image.all.tag=master-latest -n=chaos-testing
helm install --wait --timeout 360s chaos-testing milvus/milvus --set cluster.enabled=true --set image.all.repository=milvusdb/milvus --set image.all.tag=master-latest -n=chaos-testing
kubectl get pods -n chaos-testing
sleep 20s
kubectl get pods -n chaos-testing

6
.github/workflows/pod-failure-chaos-test.yaml vendored
View File

@ -10,7 +10,7 @@ on:
image_repo:
description: The image repo to use for the chaos test
required: true
default: 'milvusdb/milvus-dev'
default: 'milvusdb/milvus'
schedule:
- cron: "30 19 * * *"
jobs:
@ -29,7 +29,7 @@ jobs:
- name: Set env param
env:
DEFAULT_IMAGE_TAG: master-latest
DEFAULT_IMAGE_REPO: milvusdb/milvus-dev
DEFAULT_IMAGE_REPO: milvusdb/milvus
run: |
chaos_type=${{ matrix.chaos_type }}
release="test"-${{ matrix.pod }}-${chaos_type/_/-}
@ -80,7 +80,7 @@ jobs:
working-directory: tests/python_client/chaos
run: |
echo "latest tag:"
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q
declare -A pod_map=( ["querynode"]="queryNode" ["indexnode"]="indexNode" ["datanode"]="dataNode" ["proxy"]="proxy")
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update

6
.github/workflows/pod-kill-chaos-test-kafka-version.yaml vendored
View File

@ -10,7 +10,7 @@ on:
image_repo:
description: The image repo to use for the chaos test
required: true
default: 'milvusdb/milvus-dev'
default: 'milvusdb/milvus'
schedule:
- cron: "30 17 * * *"
jobs:
@ -29,7 +29,7 @@ jobs:
- name: Set env param
env:
DEFAULT_IMAGE_TAG: master-latest
DEFAULT_IMAGE_REPO: milvusdb/milvus-dev
DEFAULT_IMAGE_REPO: milvusdb/milvus
run: |
echo "RELEASE=test-${{ matrix.pod }}-pod-kill" >> $GITHUB_ENV
echo "IMAGE_REPO=${{ github.event.inputs.image_repo || env.DEFAULT_IMAGE_REPO}}" >> $GITHUB_ENV
@ -80,7 +80,7 @@ jobs:
working-directory: tests/python_client/chaos
run: |
echo "latest tag:"
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update
if [[ ${{ matrix.pod }} != *"standalone"* ]]; then helm install --wait --timeout 720s ${{ env.RELEASE }} milvus/milvus --set pulsar.enabled=false --set kafka.enabled=true --set image.all.repository=${{ env.IMAGE_REPO }} --set image.all.tag=${{ env.IMAGE_TAG }} -f cluster-values.yaml -n=chaos-testing; fi

6
.github/workflows/pod-kill-chaos-test.yaml vendored
View File

@ -10,7 +10,7 @@ on:
image_repo:
description: The image repo to use for the chaos test
required: true
default: 'milvusdb/milvus-dev'
default: 'milvusdb/milvus'
schedule:
- cron: "30 18 * * *"
jobs:
@ -29,7 +29,7 @@ jobs:
- name: Set env param
env:
DEFAULT_IMAGE_TAG: master-latest
DEFAULT_IMAGE_REPO: milvusdb/milvus-dev
DEFAULT_IMAGE_REPO: milvusdb/milvus
run: |
echo "RELEASE=test-${{ matrix.pod }}-pod-kill" >> $GITHUB_ENV
echo "IMAGE_REPO=${{ github.event.inputs.image_repo || env.DEFAULT_IMAGE_REPO}}" >> $GITHUB_ENV
@ -80,7 +80,7 @@ jobs:
working-directory: tests/python_client/chaos
run: |
echo "latest tag:"
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q
bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q
helm repo add milvus https://milvus-io.github.io/milvus-helm
helm repo update
if [[ ${{ matrix.pod }} != *"standalone"* ]]; then helm install --wait --timeout 720s ${{ env.RELEASE }} milvus/milvus --set image.all.repository=${{ env.IMAGE_REPO }} --set image.all.tag=${{ env.IMAGE_TAG }} -f cluster-values.yaml -n=chaos-testing; fi

4
.github/workflows/weekly-release.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
env:
IMAGE_REPO: "milvusdb"
DEV: "milvus-dev"
DEV: "milvus"
WEEKLY: "weekly-build"
TAG_PREFIX: "master-"
steps:
@ -34,7 +34,7 @@ jobs:
run: echo "tag=$(./docker_image_find_tag.sh -n ${IMAGE_REPO}/${DEV} -t ${TAG_PREFIX}latest -f ${TAG_PREFIX} -F -L -q)" >> $GITHUB_ENV
- name: Pull latest milvus-dev image with tag prefix master-
- name: Pull latest milvus image with tag prefix master-
run: |
docker pull "${IMAGE_REPO}/${DEV}:${{ env.tag }}"
docker tag "${IMAGE_REPO}/${DEV}:${{ env.tag }}" "${IMAGE_REPO}/${WEEKLY}:${{ env.tag }}"

2
build/ci/jenkins/ChaosTest.groovy
View File

@ -126,7 +126,7 @@ pipeline {
script {
def image_tag_modified = ""
if ("${params.image_tag}" == "master-latest") {
image_tag_modified = sh(returnStdout: true, script: 'bash ../../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q').trim()
image_tag_modified = sh(returnStdout: true, script: 'bash ../../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q').trim()
}
else {
image_tag_modified = "${params.image_tag}"

2
build/ci/jenkins/ChaosTestKafkaMQ.groovy
View File

@ -128,7 +128,7 @@ pipeline {
script {
def image_tag_modified = ""
if ("${params.image_tag}" == "master-latest") {
image_tag_modified = sh(returnStdout: true, script: 'bash ../../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q').trim()
image_tag_modified = sh(returnStdout: true, script: 'bash ../../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q').trim()
}
else {
image_tag_modified = "${params.image_tag}"

4
build/ci/jenkins/DeployTest.groovy
View File

@ -150,7 +150,7 @@ pipeline {
def new_image_repository_modified = ""
if ("${params.old_image_tag}" == "master-latest") {
old_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q').trim()
old_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q').trim()
}
else if ("${params.old_image_tag}" == "latest") {
old_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t latest -F -L -q').trim()
@ -160,7 +160,7 @@ pipeline {
}
if ("${params.new_image_tag}" == "master-latest") {
new_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q').trim()
new_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q').trim()
}
else {
new_image_tag_modified = "${params.new_image_tag}"

4
build/ci/jenkins/DeployTestKafkaMQ.groovy
View File

@ -162,7 +162,7 @@ pipeline {
def new_image_repository_modified = ""
if ("${params.old_image_tag}" == "master-latest") {
old_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q').trim()
old_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q').trim()
}
else if ("${params.old_image_tag}" == "latest") {
old_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t latest -F -L -q').trim()
@ -172,7 +172,7 @@ pipeline {
}
if ("${params.new_image_tag}" == "master-latest") {
new_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus-dev -t master-latest -f master- -F -L -q').trim()
new_image_tag_modified = sh(returnStdout: true, script: 'bash ../../../scripts/docker_image_find_tag.sh -n milvusdb/milvus -t master-latest -f master- -F -L -q').trim()
}
else {
new_image_tag_modified = "${params.new_image_tag}"

2
build/ci/jenkins/PublishImages.groovy
View File

@ -42,7 +42,7 @@ pipeline {
withCredentials([usernamePassword(credentialsId: "${env.DOCKER_CREDENTIALS_ID}", usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) {
sh 'docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}'
sh """
export MILVUS_IMAGE_REPO="${env.TARGET_REPO}/milvus-dev"
export MILVUS_IMAGE_REPO="${env.TARGET_REPO}/milvus"
export MILVUS_HARBOR_IMAGE_REPO="${env.HARBOR_REPO}/milvus/milvus"
export MILVUS_IMAGE_TAG="${env.BRANCH_NAME}-${date}-${gitShortCommit}"
build/build_image.sh

2
deployments/docker/cluster-distributed-deployment/inventory.ini
View File

@ -33,7 +33,7 @@ dependencies_network= host
nodes_network= host
; Setup varibale to controll what version of Milvus image to use.
image= milvusdb/milvus-dev:master-20220412-4781db8a
image= milvusdb/milvus:master-20220412-4781db8a
; Setup static IP addresses of the docker hosts as variable for container environment variable config.
; Before running the playbook, below 4 IP addresses need to be replaced with the IP of your host VM

2
tests/benchmark/ci/argo.yaml
View File

@ -209,7 +209,7 @@ spec:
arguments:
parameters:
- name: milvus-image-repository
value: harbor.milvus.io/dockerhub/milvusdb/milvus-dev
value: harbor.milvus.io/dockerhub/milvusdb/milvus
- name: milvus-image-tag
value: master-latest
- name: test-client-branch

2
tests/python_client/chaos/cluster-values.yaml
View File

@ -2,7 +2,7 @@ cluster:
enabled: true
image:
all:
repository: milvusdb/milvus-dev
repository: milvusdb/milvus
tag: master-latest
pullPolicy: IfNotPresent

2
tests/python_client/chaos/scripts/install_milvus_cluster.sh
View File

@ -7,7 +7,7 @@ bash uninstall_milvus.sh ${release} ${ns}|| true
echo "insatll cluster"
helm install --wait --debug --timeout 600s ${RELEASE_NAME:-$release} milvus/milvus \
--set image.all.repository=${REPOSITORY:-"milvusdb/milvus-dev"} \
--set image.all.repository=${REPOSITORY:-"milvusdb/milvus"} \
--set image.all.tag=${IMAGE_TAG:-"master-latest"} \
--set metrics.serviceMonitor.enabled=true \
-f ../cluster-values.yaml -n=${ns}

2
tests/python_client/chaos/scripts/install_milvus_standalone.sh
View File

@ -6,7 +6,7 @@ ns=${2:-"chaos-testing"}
bash uninstall_milvus.sh ${release} ${ns}|| true
echo "insatll standalone"
helm install --wait --debug --timeout 600s ${RELEASE_NAME:-$release} milvus/milvus \
--set image.all.repository=${REPOSITORY:-"milvusdb/milvus-dev"} \
--set image.all.repository=${REPOSITORY:-"milvusdb/milvus"} \
--set image.all.tag=${IMAGE_TAG:-"master-latest"} \
--set metrics.serviceMonitor.enabled=true \
-f ../standalone-values.yaml -n=${ns}

2
tests/python_client/chaos/standalone-values.yaml
View File

@ -2,7 +2,7 @@ cluster:
enabled: false
image:
all:
repository: milvusdb/milvus-dev
repository: milvusdb/milvus
tag: master-latest
pullPolicy: IfNotPresent

2
tests/python_client/customize/template/minimum.yaml
View File

@ -6,7 +6,7 @@ metadata:
app: milvus
spec:
components:
image: milvusdb/milvus-dev:master-latest
image: milvusdb/milvus:master-latest
config:
knowhere:
simdType: avx2

2
tests/python_client/customize/test_customize_segment_size.py
View File

@ -17,7 +17,7 @@ namespace = 'chaos-testing'
def _install_milvus(seg_size):
release_name = f"mil-segsize-{seg_size}-" + cf.gen_digits_by_length(6)
cus_configs = {'spec.components.image': 'milvusdb/milvus-dev:master-latest',
cus_configs = {'spec.components.image': 'milvusdb/milvus:master-latest',
'metadata.namespace': namespace,
'metadata.name': release_name,
'spec.components.proxy.serviceType': 'LoadBalancer',

2
tests/python_client/customize/test_simd_compat.py
View File

@ -24,7 +24,7 @@ namespace = 'chaos-testing'
def _install_milvus(simd):
release_name = f"mil-{simd.replace('_','-')}-" + cf.gen_digits_by_length(6)
cus_configs = {'spec.components.image': 'milvusdb/milvus-dev:master-latest',
cus_configs = {'spec.components.image': 'milvusdb/milvus:master-latest',
'metadata.namespace': namespace,
'metadata.name': release_name,
'spec.components.proxy.serviceType': 'LoadBalancer',

2
tests/python_client/deploy/cluster-values-second.yaml
View File

@ -2,7 +2,7 @@ cluster:
enabled: true
image:
all:
repository: milvusdb/milvus-dev
repository: milvusdb/milvus
tag: master-latest
pullPolicy: IfNotPresent

2
tests/python_client/deploy/cluster-values.yaml
View File

@ -2,7 +2,7 @@ cluster:
enabled: true
image:
all:
repository: milvusdb/milvus-dev
repository: milvusdb/milvus
tag: master-latest
pullPolicy: IfNotPresent

2
tests/python_client/deploy/scripts/get_tag.py
View File

@ -1,7 +1,7 @@
import requests
import json
milvus_dev = "https://registry.hub.docker.com/v2/repositories/milvusdb/milvus-dev/tags?ordering=last_updated"
milvus_dev = "https://registry.hub.docker.com/v2/repositories/milvusdb/milvus/tags?ordering=last_updated"
milvus = "https://registry.hub.docker.com/v2/repositories/milvusdb/milvus/tags?ordering=last_updated"

2
tests/python_client/deploy/standalone-values.yaml
View File

@ -2,7 +2,7 @@ cluster:
enabled: false
image:
all:
repository: milvusdb/milvus-dev
repository: milvusdb/milvus
tag: master-latest
pullPolicy: IfNotPresent

4
tests/python_client/deploy/test.sh
View File

@ -139,7 +139,7 @@ then
printf "download latest milvus docker-compose yaml file from github\n"
wget https://raw.githubusercontent.com/milvus-io/milvus/master/deployments/docker/${Mode}/docker-compose.yml -O docker-compose.yml
printf "start to deploy latest rc tag milvus\n"
replace_image_tag "milvusdb\/milvus-dev" $latest_tag
replace_image_tag "milvusdb\/milvus" $latest_tag
fi
if [ "$Task" == "upgrade" ];
then
@ -187,7 +187,7 @@ then
printf "download latest milvus docker-compose yaml file from github\n"
wget https://raw.githubusercontent.com/milvus-io/milvus/master/deployments/docker/${Mode}/docker-compose.yml -O docker-compose.yml
printf "start to deploy latest rc tag milvus\n"
replace_image_tag "milvusdb\/milvus-dev" $latest_tag
replace_image_tag "milvusdb\/milvus" $latest_tag
fi
cat docker-compose.yml|grep milvusdb

2
tests/python_client/loadbalance/test_auto_load_balance.py
View File

@ -17,7 +17,7 @@ namespace = "chaos-testing"
def install_milvus(release_name):
cus_configs = {'spec.components.image': 'milvusdb/milvus-dev:master-20211206-b20a238',
cus_configs = {'spec.components.image': 'milvusdb/milvus:master-20211206-b20a238',
'metadata.namespace': namespace,
'metadata.name': release_name,
'spec.components.proxy.serviceType': 'LoadBalancer'

2
tests/python_client/scale/constants.py
View File

@ -1,6 +1,6 @@
# scale object
# IMAGE_REPOSITORY = "registry.milvus.io/milvus/milvus" # repository of milvus image
IMAGE_REPOSITORY = "milvusdb/milvus-dev"
IMAGE_REPOSITORY = "milvusdb/milvus"
IMAGE_TAG = "master-20211227-b022615" # tag of milvus image
NAMESPACE = "chaos-testing" # namespace
IF_NOT_PRESENT = "IfNotPresent" # image pullPolicy IfNotPresent

4
tests/python_client/utils/util_pymilvus.py
View File

@ -1075,11 +1075,11 @@ def get_config_digest(url, token):
def get_latest_tag(limit=100):
service = "registry.docker.io"
repository = "milvusdb/milvus-dev"
repository = "milvusdb/milvus"
auth_url = "https://auth.docker.io/token?service=%s&scope=repository:%s:pull" % (service, repository)
tags_url = "https://index.docker.io/v2/%s/tags/list" % repository
tag_url = "https://index.docker.io/v2/milvusdb/milvus-dev/manifests/"
tag_url = "https://index.docker.io/v2/milvusdb/milvus/manifests/"
master_latest_digest = get_config_digest(tag_url + "master-latest", get_token(auth_url))
tags = get_tags(tags_url, get_token(auth_url))