removing testing change from bbsim-periodic-job config
Don't fail the build if log collection fails
Collecting logs on physical build in case of timeout
Change-Id: I57cbbae83b6b1b8501f89c17e75dffdd078c9ec8
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 2e2179c..7a6fd92 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -178,14 +178,14 @@
aborted {
getPodsInfo("$WORKSPACE/failed")
sh """
- kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.log
+ kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.log || true
"""
archiveArtifacts artifacts: '**/*.log,**/*.txt'
}
failure {
getPodsInfo("$WORKSPACE/failed")
sh """
- kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.logs
+ kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.logs || true
"""
archiveArtifacts artifacts: '**/*.log,**/*.txt'
}
diff --git a/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy b/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
index 5cb38ed..50f17b5 100644
--- a/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
@@ -108,7 +108,7 @@
def collectArtifacts(exitStatus) {
getPodsInfo("$WORKSPACE/${exitStatus}")
sh """
- kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/${exitStatus}/voltha.log
+ kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/${exitStatus}/voltha.log || true
"""
archiveArtifacts artifacts: '**/*.log,**/*.gz,**/*.txt,**/*.html'
sh '''
diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 4a0a9d6..fcffecf 100644
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -338,6 +338,20 @@
}
post {
+ aborted {
+ getPodsInfo("$WORKSPACE/failed")
+ sh """
+ kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.log || true
+ """
+ archiveArtifacts artifacts: '**/*.log,**/*.txt'
+ }
+ failure {
+ getPodsInfo("$WORKSPACE/failed")
+ sh """
+ kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.logs || true
+ """
+ archiveArtifacts artifacts: '**/*.log,**/*.txt'
+ }
always {
archiveArtifacts artifacts: '*.txt'
}
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 85e88b2..1c407b3 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -29,7 +29,6 @@
# NOTE why not a remote executor?
build-node: 'qct-pod4-node2'
registry: 'registry.menlo.onlab.us'
- volthaSystemTestsChange: refs/changes/92/24492/1
testTargets: |
- target: functional-single-kind
workflow: att