提交 7c4f60b2 编写于 作者: J jinhai

Merge branch 'branch-0.4.0' into 'branch-0.4.0'

Branch 0.4.0

See merge request megasearch/milvus!454

Former-commit-id: 1d99abae9f59a788cc970b27464de988607ea0ae
...@@ -224,97 +224,97 @@ spec: ...@@ -224,97 +224,97 @@ spec:
} }
} }
stage("Cluster") { // stage("Cluster") {
agent { // agent {
kubernetes { // kubernetes {
label 'dev-test' // label 'dev-test'
defaultContainer 'jnlp' // defaultContainer 'jnlp'
yaml """ // yaml """
apiVersion: v1 // apiVersion: v1
kind: Pod // kind: Pod
metadata: // metadata:
labels: // labels:
app: milvus // app: milvus
componet: test // componet: test
spec: // spec:
containers: // containers:
- name: milvus-testframework // - name: milvus-testframework
image: registry.zilliz.com/milvus/milvus-test:v0.2 // image: registry.zilliz.com/milvus/milvus-test:v0.2
command: // command:
- cat // - cat
tty: true // tty: true
volumeMounts: // volumeMounts:
- name: kubeconf // - name: kubeconf
mountPath: /root/.kube/ // mountPath: /root/.kube/
readOnly: true // readOnly: true
volumes: // volumes:
- name: kubeconf // - name: kubeconf
secret: // secret:
secretName: test-cluster-config // secretName: test-cluster-config
""" // """
} // }
} // }
stages { // stages {
stage("Deploy to Dev") { // stage("Deploy to Dev") {
steps { // steps {
gitlabCommitStatus(name: 'Deloy to Dev') { // gitlabCommitStatus(name: 'Deloy to Dev') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_deploy2dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_deploy2dev.groovy"
} // }
} // }
} // }
} // }
} // }
stage("Dev Test") { // stage("Dev Test") {
steps { // steps {
gitlabCommitStatus(name: 'Deloy Test') { // gitlabCommitStatus(name: 'Deloy Test') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_dev_test.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_dev_test.groovy"
load "${env.WORKSPACE}/ci/jenkinsfile/upload_dev_cluster_test_out.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/upload_dev_cluster_test_out.groovy"
} // }
} // }
} // }
} // }
} // }
stage ("Cleanup Dev") { // stage ("Cleanup Dev") {
steps { // steps {
gitlabCommitStatus(name: 'Cleanup Dev') { // gitlabCommitStatus(name: 'Cleanup Dev') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
} // }
} // }
} // }
} // }
} // }
} // }
post { // post {
always { // always {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
} // }
} // }
} // }
success { // success {
script { // script {
echo "Milvus Cluster CI/CD success !" // echo "Milvus Cluster CI/CD success !"
} // }
} // }
aborted { // aborted {
script { // script {
echo "Milvus Cluster CI/CD aborted !" // echo "Milvus Cluster CI/CD aborted !"
} // }
} // }
failure { // failure {
script { // script {
echo "Milvus Cluster CI/CD failure !" // echo "Milvus Cluster CI/CD failure !"
} // }
} // }
} // }
} // }
} }
} }
} }
......
...@@ -224,97 +224,97 @@ spec: ...@@ -224,97 +224,97 @@ spec:
} }
} }
stage("Cluster") { // stage("Cluster") {
agent { // agent {
kubernetes { // kubernetes {
label 'dev-test' // label 'dev-test'
defaultContainer 'jnlp' // defaultContainer 'jnlp'
yaml """ // yaml """
apiVersion: v1 // apiVersion: v1
kind: Pod // kind: Pod
metadata: // metadata:
labels: // labels:
app: milvus // app: milvus
componet: test // componet: test
spec: // spec:
containers: // containers:
- name: milvus-testframework // - name: milvus-testframework
image: registry.zilliz.com/milvus/milvus-test:v0.2 // image: registry.zilliz.com/milvus/milvus-test:v0.2
command: // command:
- cat // - cat
tty: true // tty: true
volumeMounts: // volumeMounts:
- name: kubeconf // - name: kubeconf
mountPath: /root/.kube/ // mountPath: /root/.kube/
readOnly: true // readOnly: true
volumes: // volumes:
- name: kubeconf // - name: kubeconf
secret: // secret:
secretName: test-cluster-config // secretName: test-cluster-config
""" // """
} // }
} // }
stages { // stages {
stage("Deploy to Dev") { // stage("Deploy to Dev") {
steps { // steps {
gitlabCommitStatus(name: 'Deloy to Dev') { // gitlabCommitStatus(name: 'Deloy to Dev') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_deploy2dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_deploy2dev.groovy"
} // }
} // }
} // }
} // }
} // }
stage("Dev Test") { // stage("Dev Test") {
steps { // steps {
gitlabCommitStatus(name: 'Deloy Test') { // gitlabCommitStatus(name: 'Deloy Test') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_dev_test.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_dev_test.groovy"
load "${env.WORKSPACE}/ci/jenkinsfile/upload_dev_cluster_test_out.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/upload_dev_cluster_test_out.groovy"
} // }
} // }
} // }
} // }
} // }
stage ("Cleanup Dev") { // stage ("Cleanup Dev") {
steps { // steps {
gitlabCommitStatus(name: 'Cleanup Dev') { // gitlabCommitStatus(name: 'Cleanup Dev') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
} // }
} // }
} // }
} // }
} // }
} // }
post { // post {
always { // always {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
} // }
} // }
} // }
success { // success {
script { // script {
echo "Milvus Cluster CI/CD success !" // echo "Milvus Cluster CI/CD success !"
} // }
} // }
aborted { // aborted {
script { // script {
echo "Milvus Cluster CI/CD aborted !" // echo "Milvus Cluster CI/CD aborted !"
} // }
} // }
failure { // failure {
script { // script {
echo "Milvus Cluster CI/CD failure !" // echo "Milvus Cluster CI/CD failure !"
} // }
} // }
} // }
} // }
} }
} }
} }
......
...@@ -224,97 +224,97 @@ spec: ...@@ -224,97 +224,97 @@ spec:
} }
} }
stage("Cluster") { // stage("Cluster") {
agent { // agent {
kubernetes { // kubernetes {
label 'dev-test' // label 'dev-test'
defaultContainer 'jnlp' // defaultContainer 'jnlp'
yaml """ // yaml """
apiVersion: v1 // apiVersion: v1
kind: Pod // kind: Pod
metadata: // metadata:
labels: // labels:
app: milvus // app: milvus
componet: test // componet: test
spec: // spec:
containers: // containers:
- name: milvus-testframework // - name: milvus-testframework
image: registry.zilliz.com/milvus/milvus-test:v0.2 // image: registry.zilliz.com/milvus/milvus-test:v0.2
command: // command:
- cat // - cat
tty: true // tty: true
volumeMounts: // volumeMounts:
- name: kubeconf // - name: kubeconf
mountPath: /root/.kube/ // mountPath: /root/.kube/
readOnly: true // readOnly: true
volumes: // volumes:
- name: kubeconf // - name: kubeconf
secret: // secret:
secretName: test-cluster-config // secretName: test-cluster-config
""" // """
} // }
} // }
stages { // stages {
stage("Deploy to Dev") { // stage("Deploy to Dev") {
steps { // steps {
gitlabCommitStatus(name: 'Deloy to Dev') { // gitlabCommitStatus(name: 'Deloy to Dev') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_deploy2dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_deploy2dev.groovy"
} // }
} // }
} // }
} // }
} // }
stage("Dev Test") { // stage("Dev Test") {
steps { // steps {
gitlabCommitStatus(name: 'Deloy Test') { // gitlabCommitStatus(name: 'Deloy Test') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_dev_test.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_dev_test.groovy"
load "${env.WORKSPACE}/ci/jenkinsfile/upload_dev_cluster_test_out.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/upload_dev_cluster_test_out.groovy"
} // }
} // }
} // }
} // }
} // }
stage ("Cleanup Dev") { // stage ("Cleanup Dev") {
steps { // steps {
gitlabCommitStatus(name: 'Cleanup Dev') { // gitlabCommitStatus(name: 'Cleanup Dev') {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
} // }
} // }
} // }
} // }
} // }
} // }
post { // post {
always { // always {
container('milvus-testframework') { // container('milvus-testframework') {
script { // script {
load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy" // load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
} // }
} // }
} // }
success { // success {
script { // script {
echo "Milvus Deploy to Dev Cluster CI/CD success !" // echo "Milvus Deploy to Dev Cluster CI/CD success !"
} // }
} // }
aborted { // aborted {
script { // script {
echo "Milvus Deploy to Dev Cluster CI/CD aborted !" // echo "Milvus Deploy to Dev Cluster CI/CD aborted !"
} // }
} // }
failure { // failure {
script { // script {
echo "Milvus Deploy to Dev Cluster CI/CD failure !" // echo "Milvus Deploy to Dev Cluster CI/CD failure !"
} // }
} // }
} // }
} // }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册