Skip to content

Commit 8a088f1

Browse files
author
Jenny Li
authored
[skip e2e] Update nightly to run pytest in separate pod (milvus-io#15090)
Signed-off-by: Jenny Li <jing.li@zilliz.com>
1 parent a5b533f commit 8a088f1

1 file changed

Lines changed: 21 additions & 16 deletions

File tree

build/ci/jenkins/Nightly.groovy

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pipeline {
2222
}
2323
agent {
2424
kubernetes {
25-
label "milvus-e2e-test-nightly"
25+
label "milvus-build-nightly"
2626
inheritFrom 'default'
2727
defaultContainer 'main'
2828
yamlFile "build/ci/jenkins/pod/rte.yaml"
@@ -146,6 +146,15 @@ pipeline {
146146
}
147147
}
148148
stage('E2E Test'){
149+
agent {
150+
kubernetes {
151+
label 'milvus-e2e-test-nightly'
152+
inheritFrom 'default'
153+
defaultContainer 'main'
154+
yamlFile 'build/ci/jenkins/pod/rte.yaml'
155+
customWorkspace '/home/jenkins/agent/workspace'
156+
}
157+
}
149158
steps {
150159
container('pytest') {
151160
dir ('tests/scripts') {
@@ -205,34 +214,30 @@ pipeline {
205214
}
206215
}
207216
}
208-
always {
217+
always {
218+
container('pytest'){
219+
dir("${env.ARTIFACTS}") {
220+
sh "tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz /tmp/ci_logs/test --remove-files || true"
221+
archiveArtifacts artifacts: "artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz ", allowEmptyArchive: true
222+
}
223+
}
209224
container('main') {
210-
dir ('tests/scripts') {
225+
dir ('tests/scripts') {
211226
script {
212227
def release_name=sh(returnStdout: true, script: './get_release_name.sh')
213228
sh "./uninstall_milvus.sh --release-name ${release_name}"
214-
}
215-
}
216-
}
217-
container('pytest') {
218-
dir ('tests/scripts') {
219-
script {
220-
def release_name = sh(returnStdout: true, script: './get_release_name.sh ')
221229
sh "./ci_logs.sh --log-dir /ci-logs --artifacts-name ${env.ARTIFACTS}/artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs \
222230
--release-name ${release_name}"
223231
dir("${env.ARTIFACTS}") {
224-
if ("${MILVUS_CLIENT}" == "pymilvus") {
225-
sh "tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz /tmp/ci_logs/test --remove-files || true"
226-
}
227-
archiveArtifacts artifacts: "artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz ", allowEmptyArchive: true
228232
archiveArtifacts artifacts: "artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs.tar.gz", allowEmptyArchive: true
229233
}
234+
}
230235
}
231236
}
232-
}
237+
233238
}
234239
}
235-
}
240+
}
236241
}
237242
}
238243
}

0 commit comments

Comments
 (0)