Merge "Fix xos service upgrade pipeline not working for a number of issues"
diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
index 8b14843..145a4fa 100644
--- a/jjb/api-test.yaml
+++ b/jjb/api-test.yaml
@@ -57,6 +57,11 @@
default: '$GERRIT_PATCHSET_NUMBER'
description: 'PatchSet number in Gerrit'
+ - bool:
+ name: ArchiveLogs
+ default: true
+ description: 'Archive all pod logs after test run'
+
project-type: pipeline
concurrent: true
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index b0cde41..c8854d5 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -280,7 +280,7 @@
oltDebVersion: 'openolt_asfvolt16.deb'
configurePod: true
profile: 'Default'
- time: '1'
+ time: '7'
# infosys test job - uses Default tech profile on voltha branch
- 'build_voltha_pod_test':
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 22eca23..3cf088b 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -23,7 +23,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 120, unit: 'MINUTES')
+ timeout(time: 180, unit: 'MINUTES')
}
environment {
diff --git a/jjb/pipeline/xos-core.groovy b/jjb/pipeline/xos-core.groovy
index b704369..6405553 100644
--- a/jjb/pipeline/xos-core.groovy
+++ b/jjb/pipeline/xos-core.groovy
@@ -156,6 +156,19 @@
"""
}
}
+ stage ('Archive Artifacts') {
+ when { expression { return params.ArchiveLogs } }
+ steps {
+ sh '''
+ kubectl get pods --all-namespaces
+ ## get default pod logs
+ for pod in \$(kubectl get pods --no-headers | awk '{print \$1}');
+ do
+ kubectl logs \$pod> $WORKSPACE/\$pod.log;
+ done
+ '''
+ }
+ }
}
post {
always {
@@ -186,6 +199,7 @@
passThreshold: 100,
reportFileName: 'RobotLogs/report*.html',
unstableThreshold: 0]);
+ archiveArtifacts artifacts: '*.log'
step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "kailash@opennetworking.org, teo@opennetworking.org", sendToIndividuals: false])
}
diff --git a/jjb/verify/aaa.yaml b/jjb/verify/aaa.yaml
index 438dd3e..d834f06 100644
--- a/jjb/verify/aaa.yaml
+++ b/jjb/verify/aaa.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'aaa-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!aaa-1\.10).*)$'
- 'aaa-jobs-legacy':
branch-regexp: '^(aaa-1.10)$'
diff --git a/jjb/verify/dhcpl2relay.yaml b/jjb/verify/dhcpl2relay.yaml
index ef1d849..c24ee84 100644
--- a/jjb/verify/dhcpl2relay.yaml
+++ b/jjb/verify/dhcpl2relay.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'dhcpl2relay-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!dhcpl2relay-1\.6).*)$'
- 'dhcpl2relay-jobs-legacy':
branch-regexp: '^(dhcpl2relay-1.6)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/igmp.yaml b/jjb/verify/igmp.yaml
index 143d8c4..759b1ef 100644
--- a/jjb/verify/igmp.yaml
+++ b/jjb/verify/igmp.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'igmp-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!igmp-1\.4).*)$'
- 'igmp-jobs-legacy':
branch-regexp: '^(igmp-1.4)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/igmpproxy.yaml b/jjb/verify/igmpproxy.yaml
index 3ad0794..7e16884 100644
--- a/jjb/verify/igmpproxy.yaml
+++ b/jjb/verify/igmpproxy.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'igmpproxy-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!igmpproxy-1\.2).*)$'
junit-allow-empty-results: true
- 'igmpproxy-jobs-legacy':
@@ -36,4 +36,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/kafka-onos.yaml b/jjb/verify/kafka-onos.yaml
index d9fffe5..9f32a00 100644
--- a/jjb/verify/kafka-onos.yaml
+++ b/jjb/verify/kafka-onos.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'kafka-onos-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!kafka-onos-1\..).*)$'
junit-allow-empty-results: true
- 'kafka-onos-jobs-legacy':
diff --git a/jjb/verify/mcast.yaml b/jjb/verify/mcast.yaml
index a79f955..5c5a07d 100644
--- a/jjb/verify/mcast.yaml
+++ b/jjb/verify/mcast.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'mcast-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!mcast-1\.4).*)$'
junit-allow-empty-results: true
- 'mcast-jobs-legacy':
@@ -36,4 +36,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/olt.yaml b/jjb/verify/olt.yaml
index a654a96..f2fb650 100644
--- a/jjb/verify/olt.yaml
+++ b/jjb/verify/olt.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'olt-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!olt-3\.0).*)$'
- 'olt-jobs-legacy':
branch-regexp: '^(olt-3.0)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/sadis.yaml b/jjb/verify/sadis.yaml
index fe700d0..536909a 100644
--- a/jjb/verify/sadis.yaml
+++ b/jjb/verify/sadis.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'sadis-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!sadis-3\.1).*)$'
- 'sadis-jobs-legacy':
branch-regexp: '^(sadis-3.1)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-