X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-engine.yaml;h=ff36fae1a93055af281f298954e842fa0a68bebe;hb=0c0e67aaf375e2e26e3cfa97037d628e4a96c122;hp=5dced576af355a39f5ce3427240e320eaa019857;hpb=9142936297c96fad2602e7d525bf85d7729de797;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 5dced576..ff36fae1 100644
--- 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'
@@ -126,6 +134,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'cloud-infra-verify-engine-{os}-.*'
+            - 'cloud-infra-periodic-engine-{os}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
           block-level: 'NODE'
@@ -176,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
@@ -187,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
@@ -194,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:
@@ -231,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'
@@ -251,26 +274,6 @@
           refspec: $GERRIT_REFSPEC
 
     builders:
-      - 'cloud-infra-verify-{phase}-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-
-- builder:
-    name: 'cloud-infra-verify-deploy-macro'
-    builders:
-      - shell:
-          !include-raw: ./wait-for-pkg-manager.sh
-      - shell:
-          !include-raw: ./cloud-infra-deploy.sh
-
-- builder:
-    name: 'cloud-infra-verify-test-macro'
-    builders:
-      - shell:
-          !include-raw: ./prepare-for-test.sh
-      - shell:
-          !include-raw: ./cloud-infra-test.sh
+      - 'cloud-infra-{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab: