engine: Adapt testing to stack oriented framework

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

diff --git a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
index 0f177459739c4aed7f5ed8d0cedaead562517bcc..cf3a3db02683813f055f9eb17c30e623201afe5e 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
@@ -25,10 +25,13 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
       - 'frankfurt':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
       - 'elalto':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
 
     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,17 +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-.*'
-          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: