X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=e945b39cc945c5f60af05d0181cbc536828c81e0;hb=676634418826beb45e728d3e0e34be97a7a69ebe;hp=64a2d0de56095f7960905a056a4d031d702a1c5f;hpb=514c5be00b27f2fe2d7657844adb9207d3166968;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 64a2d0de..e945b39c 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -64,7 +64,7 @@
 
     phase:
       - deploy
-      - test
+      - functest
 
     jobs:
       - 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
@@ -108,6 +108,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'
@@ -157,27 +165,40 @@
                 IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
                 DIB_OS_RELEASE=$DIB_OS_RELEASE
                 DIB_OS_ELEMENT=$DIB_OS_ELEMENT
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 CLEANUP=$CLEANUP
               git-revision: true
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: test
-          condition: SUCCESSFUL
+          name: functest
+          condition: ALWAYS
           projects:
-            - name: 'cloud-infra-periodic-{os}-test-{type}-{stream}'
+            - name: 'cloud-infra-periodic-{os}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
-                USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                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
               node-parameters: true
-              kill-phase-on: test
-              abort-all-job: true
+              kill-phase-on: NEVER
+              abort-all-job: false
+      - multijob:
+          name: yardstick
+          condition: ALWAYS
+          projects:
+            - name: 'cloud-infra-periodic-{os}-yardstick-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRIBUTION=$DISTRIBUTION
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                TEST_SUITE=$TEST_SUITE
+                CLEANUP=$CLEANUP
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: false
 
 - job-template:
     name: 'cloud-infra-periodic-{os}-{phase}-{type}-{stream}'
@@ -213,6 +234,22 @@
           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: ENGINE_ANSIBLE_PARAMS
+          default: ' -v '
+          description: 'Extra paramters that can be added when run the play books.'
+      - 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'
@@ -233,26 +270,6 @@
           refspec: ''
 
     builders:
-      - 'cloud-infra-periodic-{phase}-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-
-- builder:
-    name: 'cloud-infra-periodic-deploy-macro'
-    builders:
-      - shell:
-          !include-raw: ./wait-for-pkg-manager.sh
-      - shell:
-          !include-raw: ./cloud-infra-deploy.sh
-
-- builder:
-    name: 'cloud-infra-periodic-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: