Adapt jobs to integrate yardstick

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

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 922bdfb6b93116897dcdfd8af24b7eaa44e6371c..cf0fcbbd9c1c65c991215291e72a2418245408d3 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -71,7 +71,7 @@
 
     phase:
       - deploy
-      - test
+      - functest
 
     jobs:
       - 'cloud-infra-verify-engine-{os}-{type}-{stream}'
@@ -115,6 +115,14 @@
           name: DIB_OS_ELEMENT
           default: '{dib_os_element}'
           description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'k8-calico-nofeature'
+          description: 'Scenario to deploy and test'
+      - string:
+          name: TEST_SUITE
+          default: 'healthcheck'
+          description: 'Test suite to run'
       - string:
           name: CLEANUP
           default: 'true'
@@ -177,10 +185,10 @@
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: test
+          name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-{os}-test-{type}-{stream}'
+            - name: 'cloud-infra-verify-{os}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -188,6 +196,8 @@
                 IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
                 DIB_OS_RELEASE=$DIB_OS_RELEASE
                 DIB_OS_ELEMENT=$DIB_OS_ELEMENT
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                TEST_SUITE=$TEST_SUITE
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -195,7 +205,7 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               node-parameters: true
-              kill-phase-on: test
+              kill-phase-on: FAILURE
               abort-all-job: true
 
 - job-template:
@@ -232,6 +242,18 @@
           name: DIB_OS_ELEMENT
           default: 'ubuntu-minimal'
           description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'k8-calico-nofeature'
+          description: 'Scenario to deploy and test'
+      - string:
+          name: TEST_FW
+          default: '{phase}'
+          description: 'Test framework to use'
+      - string:
+          name: TEST_SUITE
+          default: 'healthcheck'
+          description: 'Test suite to run'
       - string:
           name: TEST_REPO_URL
           default: 'https://gerrit.nordix.org/infra/test.git'
@@ -252,7 +274,7 @@
           refspec: $GERRIT_REFSPEC
 
     builders:
-      - 'cloud-infra-verify-{phase}-macro'
+      - 'cloud-infra-verify-test-macro'
 
 # -------------------------------
 # builder macros