engine: Set deploy scenario and create k8s 1.16 jobs

Change-Id: Ie53140f0bfda535820f44071dcde7e4bf1fb0833

diff --git a/jjb/engine/verify-jobs/engine-verify-package.yaml b/jjb/engine/verify-jobs/engine-verify-package.yaml
index 5f4e80118736e72781ba861d81847cfe50f4554d..c294376673b97933e9e258071700e8e8522cae41 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-package.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-package.yaml
@@ -32,6 +32,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'k8-calico-nofeature'
 
     distro:
       - ubuntu1804
@@ -50,6 +51,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: EXECUTION_MODE
           default: '{execution-mode}'

diff --git a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
index 2ae78fe020cbdadca40cc9d29f6c49f8aab684ec..5a1051362d970362f76e7eb8d837c73c0ca81f79 100644 (file)
--- a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
@@ -257,7 +257,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'ironic-verify-{environment-type}-deploy-{distro}-city-{type}-master'
+            - name: 'ironic-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true

diff --git a/jjb/engine/verify-jobs/ironic-verify-package.yaml b/jjb/engine/verify-jobs/ironic-verify-package.yaml
index 7835cf75119236c7bf912936512190028397dce1..a43e1ec4a7b30a2f55ab97f586472f5475e0befd 100644 (file)
--- a/jjb/engine/verify-jobs/ironic-verify-package.yaml
+++ b/jjb/engine/verify-jobs/ironic-verify-package.yaml
@@ -32,6 +32,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'k8-calico-nofeature'
 
     distro:
       - ubuntu1804
@@ -52,6 +53,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: EXECUTION_MODE
           default: '{execution-mode}'

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index 4093ba5b9e1bbbeae8e357e243f981dc883e62d5..cab7e12d2e4eacd7ad8e1b47bb6cdf37d38c5b52 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -32,6 +32,9 @@
       - '1_17':
           branch: '1.17'
           deploy-scenario: 'k8-multus-plugins'
+      - '1_16':
+          branch: '1.16'
+          deploy-scenario: 'k8-calico-nofeature'
       - '1_15':
           branch: '1.15'
           deploy-scenario: 'k8-calico-nofeature'
@@ -273,7 +276,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'kubernetes-verify-{environment-type}-deploy-{distro}-city-{type}-master'
+            - name: 'kubernetes-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
@@ -285,7 +288,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'kubernetes-verify-{environment-type}-functest-{distro}-city-{type}-master'
+            - name: 'kubernetes-verify-{environment-type}-functest-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: false
               node-parameters: true

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
index 73a1e4d22aaa75930801aa8a7b091ca4a4cf5746..153776bd8d2cfeac3d7d534fc04b76ff42de5658 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
@@ -35,6 +35,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'k8-multus-plugins'
       - '1_17':
           branch: '1.17'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
@@ -44,6 +45,17 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'k8-multus-plugins'
+      - '1_16':
+          branch: '1.16'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
+          execution-mode: 'packaging'
+          gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+          deploy-scenario: 'k8-calico-nofeature'
       - '1_15':
           branch: '1.15'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
@@ -53,6 +65,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'k8-calico-nofeature'
 
     distro:
       - ubuntu1804
@@ -71,6 +84,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: EXECUTION_MODE
           default: '{execution-mode}'

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
index e4c9875fe2407dd7dd86b4461abfa62f1fdc3970..0e64c81c7649ea454e9a9d9a08f1e1973688454e 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
@@ -32,6 +32,9 @@
       - '1_17':
           branch: '1.17'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
+      - '1_16':
+          branch: '1.16'
+          gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
       - '1_15':
           branch: '1.15'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'

diff --git a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
index cf3a3db02683813f055f9eb17c30e623201afe5e..c34477e0452ff72337be79af755c40b6b87fb432 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
@@ -264,7 +264,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-master'
+            - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
@@ -276,7 +276,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-master'
+            - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: false
               node-parameters: true

diff --git a/jjb/engine/verify-jobs/onap-verify-package.yaml b/jjb/engine/verify-jobs/onap-verify-package.yaml
index 1e5676246e73587da0b3f5dfbbdc21f5e5165b45..5820b5fd3389f0c9fd61bf80d409b74f0399a174 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-package.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-package.yaml
@@ -32,6 +32,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'onap-sdc-full'
       - 'frankfurt':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
@@ -41,6 +42,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'onap-sdc-full'
       - 'elalto':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
@@ -50,6 +52,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'onap-sdc-full'
 
     distro:
       - ubuntu1804
@@ -68,6 +71,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: EXECUTION_MODE
           default: '{execution-mode}'

diff --git a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
index 5125be3d7e5439f5c8b6169e13361d6ee2c03f21..5841d392ffe62d0bd710230f7df8b8404f5e58b4 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
@@ -264,7 +264,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'openstack-verify-{environment-type}-deploy-{distro}-city-{type}-master'
+            - name: 'openstack-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
@@ -276,7 +276,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'openstack-verify-{environment-type}-functest-{distro}-city-{type}-master'
+            - name: 'openstack-verify-{environment-type}-functest-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: false
               node-parameters: true

diff --git a/jjb/engine/verify-jobs/openstack-verify-package.yaml b/jjb/engine/verify-jobs/openstack-verify-package.yaml
index 3e1e59b7bbcb7c1c12ca0334ec42c00102455cc3..8efc2d797f1a0b1af49f204ce1b314bcf2ff06a6 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-package.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-package.yaml
@@ -32,6 +32,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'train':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
@@ -41,6 +42,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'stein':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
@@ -50,6 +52,7 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'os-nosdn-nofeature'
 
     distro:
       - ubuntu1804
@@ -68,6 +71,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: EXECUTION_MODE
           default: '{execution-mode}'