Update onos and fabric charts in preparation for SD-BNG support
- Bumped ONOS Docker image to 2.2
- Bumped fabric synchronizer to 2.3.0 with support for Stratum-based
devices
- Bumped fabric-crossconnect synchronizer to 1.3.0 with bugfixes
This patch updates the default values for seba-services and other charts
to use the latest versions of the ONOS apps that work with ONOS 2.2.
This is done to make the siab Jenkins job pass. There is no explicity
dependency between the seba-services chart and the onos one. The siab
scripts always install the lastest onos chart, thus requiring the app
versions to be updated as well.
Change-Id: Idcff10e4e15677fc13cf1ea4dca9125a809f4198
diff --git a/configs/seba-ponsim-latest.yaml b/configs/seba-ponsim-latest.yaml
index 7b4359c..128f92f 100644
--- a/configs/seba-ponsim-latest.yaml
+++ b/configs/seba-ponsim-latest.yaml
@@ -35,8 +35,7 @@
tag: 'master'
# ONOS
onos:
- repository: matteoscandolo/onos
- tag: '1.13-branch'
+ tag: '2.2-latest'
# VOLTHA
vcore:
tag: 'latest'
@@ -126,17 +125,17 @@
legacyPonsim: False
# ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
+aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=2.0.1-SNAPSHOT&e=oar"
+aaaAppVersion: "2.0.1.SNAPSHOT"
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
+sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=4.0.2-SNAPSHOT&e=oar"
+sadisAppVersion: "4.0.2.SNAPSHOT"
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
+dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=2.0.1-SNAPSHOT&e=oar"
+dhcpl2relayAppVersion: "2.0.1.SNAPSHOT"
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
+oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=4.0.1-SNAPSHOT&e=oar"
+oltAppVersion: "4.0.1.SNAPSHOT"
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
+kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=2.0.1-SNAPSHOT&e=oar"
+kafkaAppVersion: "2.0.1.SNAPSHOT"
diff --git a/onos/Chart.yaml b/onos/Chart.yaml
index 39e87f8..7945532 100644
--- a/onos/Chart.yaml
+++ b/onos/Chart.yaml
@@ -13,8 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+apiVersion: v1
name: onos
description: Open Network Operating System
-version: 1.1.4
+version: 2.0.0-b1
icon: https://guide.opencord.org/logos/onos.svg
-appVersion: 1.13.9
+# FIXME: replace with 2.2.1 when released
+appVersion: 2.2.1-b4
diff --git a/workflows/att-workflow/Chart.yaml b/workflows/att-workflow/Chart.yaml
index e1a225f..f410b4e 100644
--- a/workflows/att-workflow/Chart.yaml
+++ b/workflows/att-workflow/Chart.yaml
@@ -17,7 +17,7 @@
name: att-workflow
description: A Helm chart for XOS's "att-workflow"
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.2.5
+version: 1.2.6
# xosproject/tosca-loader version
appVersion: 1.3.1
diff --git a/workflows/att-workflow/values.yaml b/workflows/att-workflow/values.yaml
index c1b5da7..2ed1e8c 100644
--- a/workflows/att-workflow/values.yaml
+++ b/workflows/att-workflow/values.yaml
@@ -37,5 +37,5 @@
xosAdminPassword: "letmein"
# ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0/aaa-app-1.9.0.oar"
-aaaAppVersion: "1.9.0"
+aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.0.0/aaa-app-2.0.0.oar"
+aaaAppVersion: "2.0.0"
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index d1483cf..ab7a697 100644
--- a/xos-profiles/seba-services/Chart.yaml
+++ b/xos-profiles/seba-services/Chart.yaml
@@ -17,7 +17,7 @@
name: seba-services
description: A Helm chart for XOS's "SEBA" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.2.10
+version: 1.3.0
# xosproject/tosca-loader version
appVersion: 1.3.1
diff --git a/xos-profiles/seba-services/requirements.yaml b/xos-profiles/seba-services/requirements.yaml
index 89d646c..9ae5814 100644
--- a/xos-profiles/seba-services/requirements.yaml
+++ b/xos-profiles/seba-services/requirements.yaml
@@ -22,15 +22,15 @@
repository: https://charts.opencord.org
condition: onos-service.enabled
- name: fabric
- version: 2.2.2
- repository: https://charts.opencord.org
+ version: 2.3.0
+ repository: file://../../xos-services/fabric
condition: fabric.enabled
- name: volt
version: 2.2.5
repository: https://charts.opencord.org
- name: fabric-crossconnect
- version: 1.2.2
- repository: https://charts.opencord.org
+ version: 1.3.0
+ repository: file://../../xos-services/fabric-crossconnect
- name: sadis-server
version: 1.0.4
repository: https://charts.opencord.org
diff --git a/xos-profiles/seba-services/values.yaml b/xos-profiles/seba-services/values.yaml
index bfc647c..41ba27f 100644
--- a/xos-profiles/seba-services/values.yaml
+++ b/xos-profiles/seba-services/values.yaml
@@ -40,17 +40,17 @@
xosAdminPassword: "letmein"
# ONOS applications
-sadisAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/3.1.0/sadis-app-3.1.0.oar"
-sadisAppVersion: "3.1.0"
+sadisAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/4.0.1/sadis-app-4.0.1.oar"
+sadisAppVersion: "4.0.1"
-dhcpl2relayAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/1.6.0/dhcpl2relay-app-1.6.0.oar"
-dhcpl2relayAppVersion: "1.6.0"
+dhcpl2relayAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.0.0/dhcpl2relay-app-2.0.0.oar"
+dhcpl2relayAppVersion: "2.0.0"
-oltAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/3.0.1/olt-app-3.0.1.oar"
-oltAppVersion: "3.0.1"
+oltAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.0.0/olt-app-4.0.0.oar"
+oltAppVersion: "4.0.0"
-kafkaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/kafka/1.1.0/kafka-1.1.0.oar"
-kafkaAppVersion: "1.1.0"
+kafkaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.0.0/kafka-2.0.0.oar"
+kafkaAppVersion: "2.0.0"
onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"
diff --git a/xos-services/fabric-crossconnect/Chart.yaml b/xos-services/fabric-crossconnect/Chart.yaml
index 79dab66..0537773 100644
--- a/xos-services/fabric-crossconnect/Chart.yaml
+++ b/xos-services/fabric-crossconnect/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for XOS's "fabric-crossconnect" service
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.2.2
-appVersion: 1.2.2
+version: 1.3.0
+appVersion: 1.3.0
diff --git a/xos-services/fabric/Chart.yaml b/xos-services/fabric/Chart.yaml
index 2d159b6..a8eab56 100644
--- a/xos-services/fabric/Chart.yaml
+++ b/xos-services/fabric/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for XOS's "fabric" service
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.2.2
-appVersion: 2.2.2
+version: 2.3.0
+appVersion: 2.3.0