Merge "Capturing component startup logs"
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 375388e..f2cbf09 100644
--- a/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
@@ -124,7 +124,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/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index 16c0bcb..86443a3 100644
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -206,6 +206,11 @@
"""
}
}
+ stage('Create K8s Cluster') {
+ steps {
+ createKubernetesCluster([nodes: 3])
+ }
+ }
stage('Run Test') {
steps {
test_software_upgrade("onos-app-upgrade")
diff --git a/jjb/pipeline/voltha/voltha-2.7/software-upgrades.groovy b/jjb/pipeline/voltha/voltha-2.7/software-upgrades.groovy
index e9623d6..124e05b 100644
--- a/jjb/pipeline/voltha/voltha-2.7/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/voltha-2.7/software-upgrades.groovy
@@ -202,6 +202,11 @@
"""
}
}
+ stage('Create K8s Cluster') {
+ steps {
+ createKubernetesCluster([nodes: 3])
+ }
+ }
stage('Run Test') {
steps {
test_software_upgrade("onos-app-upgrade")
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 170fea5..971511d 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -9,7 +9,7 @@
- 'software-upgrades-test':
name: 'periodic-software-upgrade-test-bbsim'
pipeline-script: 'voltha/master/software-upgrades.groovy'
- build-node: 'qct-pod4-node2'
+ build-node: 'ubuntu18.04-basebuild-8c-15g'
code-branch: 'master'
aaa-version: '2.4.0.SNAPSHOT'
aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0-SNAPSHOT/aaa-app-2.4.0-20210504.145538-2.oar'
@@ -39,7 +39,7 @@
- 'software-upgrades-test':
name: 'periodic-software-upgrade-test-bbsim-2.7'
pipeline-script: 'voltha/voltha-2.7/software-upgrades.groovy'
- build-node: 'qct-pod4-node2'
+ build-node: 'ubuntu18.04-basebuild-8c-15g'
code-branch: 'voltha-2.7'
aaa-version: '2.3.0'
aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0/aaa-app-2.3.0.oar'
@@ -56,7 +56,7 @@
kafka-version: '2.6.0'
kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.6.0/kafka-2.6.0.oar'
adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.1.8'
- adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.8'
+ adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.11'
rw-core-image: 'voltha/voltha-rw-core:2.7.0'
ofagent-image: 'voltha/voltha-ofagent-go:1.5.2'
onu-image-name: 'software-image.img'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 85e88b2..6a9dfde 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -26,10 +26,6 @@
code-branch: 'master'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
time-trigger: "H H/23 * * *"
- # 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
@@ -50,9 +46,6 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-test-bbsim'
- # NOTE why not a remote executor?
- build-node: 'qct-pod4-node2'
- registry: 'registry.menlo.onlab.us'
code-branch: 'master'
olts: 2
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
@@ -129,7 +122,7 @@
- 'voltha-periodic-test':
name: 'patchset-voltha-openonu-go-test-bbsim'
- trigger-comment: "voltha test openonu"
+ trigger-comment: "voltha test openonu singleolt"
code-branch: '$GERRIT_BRANCH'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
gerrit-project: '$GERRIT_PROJECT'
@@ -266,9 +259,6 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-test-DMI'
- # NOTE why not a remote executor?
- build-node: 'qct-pod4-node2'
- registry: 'registry.menlo.onlab.us'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
code-branch: 'master'
time-trigger: "H H/23 * * *"
@@ -325,9 +315,6 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-sanity-test-multi-runs'
- # NOTE why not a remote executor?
- build-node: 'qct-pod4-node2'
- registry: 'registry.menlo.onlab.us'
code-branch: 'master'
time-trigger: "H H/23 * * *"
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index a682632..e9e960e 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -151,7 +151,7 @@
default: '{cordTesterChange}'
description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
- # NOTE is this needed/used?
+ # this is used in the Adtran DT job
- string:
name: openoltAdapterChart
default: '{openoltAdapterChart}'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 6091b84..658d9db 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -575,3 +575,32 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-test'
+
+ # Berlin pod with adtran gpon olt/onu - master 1T8GEM tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon-adtran'
+ release: '2.6'
+ branch: 'voltha-2.6'
+ VolthaEtcdPort: 9999
+ name-extension: '_DT'
+ work-flow: 'DT'
+ profile: '1T8GEM'
+ reinstall-olt: false
+ Jenkinsfile: 'Jenkinsfile-voltha-build' # we are cloning voltha-system-test@2.6 that still has it
+ openoltAdapterChart: '/home/community/adtran-2021-01-29/voltha-adapter-adtran-olt'
+ time: '7'
+
+ # Berlin POD adtran test job - master versions: uses 1T8GEM tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon-adtran'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ release: '2.6'
+ branch: 'voltha-2.6'
+ test-repo: 'voltha-system-tests'
+ profile: '1T8GEM'
+ power-switch: True
+ oltAdapterAppLabel: 'adapter-adtran-olt'
+ pipeline-script: 'voltha-dt-physical-functional-tests.groovy'