Merge "Re-enabling Job on Berlin POD: adtran@2.6"
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 1c407b3..6a9dfde 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -26,9 +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'
testTargets: |
- target: functional-single-kind
workflow: att
@@ -49,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'
@@ -128,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'
@@ -265,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 * * *"
@@ -324,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'