engine: Set deploy scenario and create k8s 1.16 jobs

[infra/cicd.git] / jjb / engine / verify-jobs / openstack-verify-deploy-test.yaml

diff --git a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
index 409be753691ebc5efc6f07e15aaaad6a12c30455..5841d392ffe62d0bd710230f7df8b8404f5e58b4 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
@@ -25,10 +25,13 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'train':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'stein':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
 
     environment-type:
       - online:
@@ -82,6 +85,14 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-{environment-type}-{distro}-fra'
@@ -154,18 +165,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-online-deploy-test-.*'
-            - 'kubernetes-verify-offline-deploy-test-.*'
-            - 'onap-verify-offline-deploy-test-.*'
-            - 'openstack-verify-offline-deploy-test-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 8
+          option: category
+          categories:
+            - engine-verify-deploy-test
 
     scm:
       - git-scm-gerrit:
@@ -257,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
@@ -269,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