X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-release-deploy-test.yaml;h=d6a89a79decc86ebfb22a71fc52d3098910e1f00;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=08a3eef1920bfdb40e4e91e7b384e380143efc66;hpb=99dea4dbf8646b3e5e688615d81ee6905fc91542;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
index 08a3eef1..d6a89a79 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -26,7 +26,11 @@
       - 'master':
           branch: '{stream}'
           k8s-version: '1.15'
-          deploy-scenario: 'onap-sdc-nofeature'
+          deploy-scenario: 'onap-full-nofeature'
+      - 'guilin':
+          branch: '{stream}'
+          k8s-version: '1.15'
+          deploy-scenario: 'onap-full-nofeature'
       - 'frankfurt':
           branch: '{stream}'
           k8s-version: '1.15'
@@ -40,9 +44,10 @@
       - offline:
           disabled: false
           execution-mode: offline-deployment
-    # just deploy phase for now and ONAP testing isn't defined yet
+
     phase:
       - deploy
+      - test
 
 
     type:
@@ -63,6 +68,8 @@
       - 'onap-release-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
       - 'onap-release-{environment-type}-deploy-{distro}-{cloud}-{type}-{stream}'
       - 'onap-release-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}'
+      - 'onap-release-{environment-type}-xtesting-infra-healthcheck-{distro}-{cloud}-{type}-{stream}'
+      - 'onap-release-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
 
 - job-template:
     name: 'onap-release-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
@@ -112,32 +119,16 @@
           description: 'IDF file to use for deployment'
       - string:
           name: HEAT_STACK_NAME
-          default: "nordix-cicd-verify-onap-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "nordix-cicd-verify-onap-{environment-type}-{distro}-{stream}"
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-onap-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "keypair-nordix-cicd-verify-onap-{environment-type}-{distro}-{stream}"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
-      - string:
-          name: TEST_REPO_URL
-          default: 'https://gerrit.nordix.org/infra/test.git'
-          description: 'URL to clone the test repo from'
-      - string:
-          name: TEST_FW
-          default: 'functest'
-          description: 'Test framework to use'
-      - string:
-          name: TEST_SUITE
-          default: 'healthcheck'
-          description: 'Test suite to run'
-      - string:
-          name: YARDSTICK_DISPATCHER
-          default: 'file'
-          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: DELETE_STACK
           default: 'false'
@@ -176,7 +167,7 @@
           wipe-workspace: true
     wrappers:
       - build-timeout:
-          timeout: 300
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -210,7 +201,6 @@
                 fi
 
     builders:
-      - 'generate-release-metadata-macro'
       - 'generate-k8sdeployment-environment-macro'
       - multijob:
           name: "{environment-type} deployment on {type} instances"
@@ -230,7 +220,23 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
-              property-file: $WORKSPACE/change.properties
+      - multijob:
+          name: xTesting for infra-healthcheck and healthcheck
+          condition: ALWAYS
+          execution-type: SEQUENTIALLY
+          projects:
+            - name: 'onap-release-{environment-type}-xtesting-infra-healthcheck-{distro}-{cloud}-{type}-{stream}'
+              current-parameters: true
+              git-revision: true
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: false
+            - name: 'onap-release-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
+              current-parameters: true
+              git-revision: true
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: false
     publishers:
       - postbuildscript:
           builders:
@@ -261,7 +267,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 300
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -294,7 +300,7 @@
           option: project
     wrappers:
       - build-timeout:
-          timeout: 300
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -311,3 +317,83 @@
       - 'wait-pkg-mgr-macro'
       - 'download-deploy-artifact-macro'
       - 'deploy-macro'
+
+- job-template:
+    name: 'onap-release-{environment-type}-xtesting-infra-healthcheck-{distro}-{cloud}-{type}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+      - string:
+          name: EXECUTION_MODE
+          default: '{execution-mode}'
+          description: 'Execution mode'
+      - string:
+          name: TEST_REPO_URL
+          default: 'https://gerrit.nordix.org/infra/test.git'
+          description: 'URL to clone the test repo from'
+      - string:
+          name: TEST_FW
+          default: 'xtesting'
+          description: 'Test framework to use'
+      - string:
+          name: TEST_SUITE
+          default: 'infra-healthcheck'
+          description: 'Test suite to run'
+
+
+    properties:
+      - logrotate
+      - throttle:
+          max-per-node: 1
+          max-total: 3
+          option: project
+    wrappers:
+      - build-timeout:
+          timeout: 600
+      - mask-passwords
+      - fix-workspace-permissions
+
+    builders:
+      - 'generate-ssh-keypair-macro'
+      - 'wait-pkg-mgr-macro'
+      - 'download-xtesting-artifact-macro'
+      - 'xtesting-infra-healthcheck-macro'
+
+- job-template:
+    name: 'onap-release-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+      - string:
+          name: EXECUTION_MODE
+          default: '{execution-mode}'
+          description: 'Execution mode'
+      - string:
+          name: TEST_REPO_URL
+          default: 'https://gerrit.nordix.org/infra/test.git'
+          description: 'URL to clone the test repo from'
+      - string:
+          name: TEST_FW
+          default: 'xtesting'
+          description: 'Test framework to use'
+      - string:
+          name: TEST_SUITE
+          default: 'healthcheck'
+          description: 'Test suite to run'
+
+    properties:
+      - logrotate
+      - throttle:
+          max-per-node: 1
+          max-total: 3
+          option: project
+    wrappers:
+      - build-timeout:
+          timeout: 600
+      - mask-passwords
+      - fix-workspace-permissions
+
+    builders:
+      - 'xtesting-healthcheck-macro'