Merge "Fix automation of node image building"

diff --git a/jjb/airship/job_feature_tests_centos.yml b/jjb/airship/job_feature_tests_centos.yml
index dc59e7bf39f2f563ca978525300adde1299063df..d9113dcf73bcaa4141a243bb94f45288f76c502d 100644 (file)
--- a/jjb/airship/job_feature_tests_centos.yml
+++ b/jjb/airship/job_feature_tests_centos.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS

diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml
index da8b7376882ae8a66cb2efe61d9e97b94ac41b59..e7c46e1e2feff7b0b1d905b3f553163fecba5847 100644 (file)
--- a/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_ubuntu.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS

diff --git a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
index 2f26569fdd5ee573e4c3b875e73aa9477c3a2f5a..9645fc4225bd093564c495abef182845f52d2ee0 100644 (file)
--- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS

diff --git a/jjb/airship/job_master_feature_tests_centos.yml b/jjb/airship/job_master_feature_tests_centos.yml
index b55eaad89e55efb2b6d6e5378079add314ab2998..37b4d08fc0fc94b0e6909448ceb3581bbf1d8e6f 100644 (file)
--- a/jjb/airship/job_master_feature_tests_centos.yml
+++ b/jjb/airship/job_master_feature_tests_centos.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS

diff --git a/jjb/airship/job_master_feature_tests_ubuntu.yml b/jjb/airship/job_master_feature_tests_ubuntu.yml
index c9ef2df4cc8fadca77f47cc10615ec5d5683de64..0771d292d563441bdf14c507ca62ddd28a6c6067 100644 (file)
--- a/jjb/airship/job_master_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_ubuntu.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS

diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 729cab0612fc0073a7a118a833f82ca7d206e2ed..82f6b066b90ef5e99325aa44ad9182a170dc44e4 100644 (file)
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS

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 6caf4e9b6835caf99945bfbcf09f336adaeb4f6d..c94eef33ad4d44157f7e9a375af16def95203faf 100644 (file)
--- 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}'
@@ -222,6 +222,9 @@
     wrappers:
       - build-timeout:
           timeout: 600
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
index 4add3aaf74f45f712123d6648ade2e39784d5b6c..37795ca0491a04a6ddee47e198c544526638e3bc 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
@@ -174,6 +174,9 @@
           single-use: True
       - build-timeout:
           timeout: 300
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'

diff --git a/jjb/onap/oom/oom-build-jobs.yaml b/jjb/onap/oom/oom-build-jobs.yaml
index 3da71ed1e3e7d3213ce3c8db30efb4317c54432f..4bac5dbe9a218b282fbff79e612a6d96ded77f86 100644 (file)
--- 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,