engine: Set deploy scenario and create k8s 1.16 jobs

[infra/cicd.git] / jjb / engine / verify-jobs / engine-verify-package.yaml

diff --git a/jjb/engine/verify-jobs/engine-verify-package.yaml b/jjb/engine/verify-jobs/engine-verify-package.yaml
index 22b1e0b21c0a83a9cf22893eb8fc2ec6138e57d5..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}'
@@ -78,17 +83,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-package-.*'
-            - 'kubernetes-verify-package-.*'
-            - 'onap-verify-package-.*'
-          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: 4
+          option: category
+          categories:
+            - engine-verify-package
 
     scm:
       - git-scm-gerrit: