Merge "Copy v2.8 setup into v2.11, update versioned OAR images"
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 19df681..61aaf0a 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -1,5 +1,7 @@
---
# voltha 2.X tests
+# oar image URLs that redirect away from oss to maven-central (?)
+# olt, dhcpl2relay, igmpproxy, kafka
- project:
name: software-upgrades
@@ -11,23 +13,23 @@
pipeline-script: 'voltha/master/software-upgrades.groovy'
build-node: 'ubuntu18.04-basebuild-8c-15g'
code-branch: 'master'
- aaa-version: '2.6.0.SNAPSHOT'
- aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.6.0-SNAPSHOT/aaa-app-2.6.0-20220527.132039-4.oar'
+ aaa-version: '2.9.0.SNAPSHOT'
+ aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.9.0-SNAPSHOT/aaa-app-2.9.0-20230111.164338-1.oar'
olt-version: '5.1.0.SNAPSHOT'
olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.1.0-SNAPSHOT/olt-app-5.1.0-20220629.020323-21.oar'
dhcpl2relay-version: '2.7.0.SNAPSHOT'
dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.7.0-SNAPSHOT/dhcpl2relay-app-2.7.0-20220527.132023-5.oar'
igmpproxy-version: '2.5.0.SNAPSHOT'
igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.5.0-SNAPSHOT/onos-app-igmpproxy-app-2.5.0-20220318.145612-3.oar'
- sadis-version: '5.6.0.SNAPSHOT'
- sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.6.0-SNAPSHOT/sadis-app-5.6.0-20220614.170917-8.oar'
- mcast-version: '2.6.0.SNAPSHOT'
- mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.6.0-SNAPSHOT/mcast-app-2.6.0-20220318.145711-3.oar'
+ sadis-version: '5.11.0.SNAPSHOT'
+ sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.11.0-SNAPSHOT/sadis-app-5.11.0-20230110.082138-1.oar'
+ mcast-version: '2.9.0.SNAPSHOT'
+ mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.9.0-SNAPSHOT/mcast-app-2.9.0-20230110.175410-1.oar'
kafka-version: '2.9.0.SNAPSHOT'
kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.9.0-SNAPSHOT/kafka-2.9.0-20220609.001209-5.oar'
openolt-adapter-deploy-base-tag: '4.2.6'
openonu-adapter-deploy-base-tag: '2.2.8'
- rw-core-deploy-base-tag: '3.1.6'
+ rw-core-deploy-base-tag: '3.1.8'
ofagent-deploy-base-tag: '2.1.2'
onu-image-version: 'BBSM_IMG_00002'
onu-image-url: 'http://bbsim0:50074/images/software-image.img'
@@ -37,6 +39,37 @@
onu-image-crc: '0'
time-trigger: "H H/23 * * *"
+ - 'software-upgrades-test-voltha-2.11':
+ name: 'periodic-software-upgrade-test-bbsim-2.11'
+ pipeline-script: 'voltha/voltha-2.11/software-upgrades.groovy'
+ build-node: 'ubuntu18.04-basebuild-8c-15g'
+ code-branch: 'voltha-2.11'
+ aaa-version: '2.9.0'
+ aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.9.0/aaa-app-2.9.0.oar'
+ olt-version: '5.2.3'
+ olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.2.3/olt-app-5.2.3.oar'
+ dhcpl2relay-version: '2.9.0'
+ dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.9.0/dhcpl2relay-app-2.9.0.oar'
+ igmpproxy-version: '2.7.0'
+ igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.7.0/onos-app-igmpproxy-app-2.7.0.oar'
+ sadis-version: '5.10.0'
+ sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.10.0/sadis-app-5.10.0.oar'
+ mcast-version: '2.8.0'
+ mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.8.0.oar'
+ kafka-version: '2.11.1'
+ kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.11.1/kafka-2.11.1.oar'
+ adapter-open-olt-image: 'voltha/voltha-openolt-adapter:4.2.12'
+ adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:2.7.3'
+ rw-core-image: 'voltha/voltha-rw-core:3.1.8'
+ ofagent-image: 'voltha/voltha-ofagent-go:2.1.3'
+ onu-image-version: 'BBSM_IMG_00002'
+ onu-image-url: 'http://bbsim0:50074/images/software-image.img'
+ onu-image-vendor: 'BBSM'
+ onu-image-activate-on-success: 'false'
+ onu-image-commit-on-success: 'false'
+ onu-image-crc: '0'
+ time-trigger: "H H/23 * * *"
+
- 'software-upgrades-test-old':
name: 'periodic-software-upgrade-test-bbsim-2.8'
pipeline-script: 'voltha/voltha-2.8/software-upgrades.groovy'
diff --git a/makefiles/nop b/makefiles/nop
new file mode 100644
index 0000000..554fd41
--- /dev/null
+++ b/makefiles/nop
@@ -0,0 +1,10 @@
+## -----------------------------------------------------------------------
+## Intent:
+## o This file can be modified for side effects.
+## o The git delta will trigger running a jenkins job.
+## o The job catalyst is not dependent on any source changes so errors
+## reported are guaranteed to be latent or intermittent bugs in or
+## around the code base.
+## -----------------------------------------------------------------------
+
+Mon Jan 30 11:21:08 AM EST 2023