From 3bdff39a39f3221eceaa07408d65c185fe75a38a Mon Sep 17 00:00:00 2001
From: Akash Rajguru <akash.rajguru@est.tech>
Date: Tue, 16 Nov 2021 08:27:55 +0000
Subject: [PATCH] Update onap verify and onap oom helm build

 * updated onap verify to use k8s v1.19 for onap 9.0.0
 * Disable offline-deployment.
 * Varify packaging and online deployment will go in parallel.
 * Updated oom helm build to use helm v3.5.0 and include
   multicloud-starlingx, multicloud-vio, multicloud-windriver
   required by onap 9.0.0

Change-Id: I84944fd1a93f539fdda762e89d620033738071d4
---
 jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml | 8 ++++----
 jjb/onap/oom/oom-build-jobs.yaml                       | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index 6caf4e9b6..c92753036 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -25,7 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
-          k8s-version: 'master'
+          k8s-version: '1.19'
           deploy-scenario: 'onap-full-nofeature'
       - 'guilin':
           branch: '{stream}'
@@ -49,7 +49,7 @@
           unstable: false
           notbuilt: false
       - offline:
-          disabled: false
+          disabled: true
           execution-mode: offline-deployment
           successful: false
           failed: false
@@ -77,8 +77,8 @@
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
 
     # This should be
-    dependency-jobs: 'onap-verify-package-{distro}-{stream}'
-    dependency-job-var: 'TRIGGER_onap_verify_package_{distro}_{stream}_BUILD_RESULT'
+    dependency-jobs: 'onap-verify-tox-{stream}'
+    dependency-job-var: 'TRIGGER_onap_verify_tox_{stream}_BUILD_RESULT'
 
     jobs:
       - 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
diff --git a/jjb/onap/oom/oom-build-jobs.yaml b/jjb/onap/oom/oom-build-jobs.yaml
index 3da71ed1e..b731a6dc2 100644
--- a/jjb/onap/oom/oom-build-jobs.yaml
+++ b/jjb/onap/oom/oom-build-jobs.yaml
@@ -43,7 +43,7 @@
       - nordix-gerrit-parameters
       - string:
           name: HELM_URL
-          default: 'https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz'
+          default: 'https://get.helm.sh/helm-v3.5.0-linux-amd64.tar.gz'
           description: Specifies the URL to fetch Helm.
       - string:
           name: HELM_PUSH_URL
@@ -109,6 +109,9 @@
             .modeling.enabled=true,
             .msb.enabled=true,
             .multicloud.enabled=true,
+            .multicloud.multicloud-starlingx.enabled=true,
+            .multicloud.multicloud-vio.enabled=true,
+            .multicloud.multicloud-windriver.enabled=true
             .nbi.enabled=true,
             .oof.enabled=true,
             .platform.enabled=true,
-- 
2.25.1