X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-verify-deploy-test.yaml;h=5e8234f7eaa601ad0261a86a47e7f881bec6a28c;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=512fccb76c22038ad65a636c9ca2467549ff12cf;hpb=cbc58156b108c656d25b16aee7f62523b04d11b3;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index 512fccb76..5e8234f7e 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -24,9 +24,13 @@
 
     stream:
       - 'master':
+          branch: '{stream}'
+          k8s-version: 'master'
+          deploy-scenario: 'onap-full-nofeature'
+      - 'guilin':
           branch: '{stream}'
           k8s-version: '1.15'
-          deploy-scenario: 'onap-sdc-nofeature'
+          deploy-scenario: 'onap-full-nofeature'
       - 'frankfurt':
           branch: '{stream}'
           k8s-version: '1.15'
@@ -45,15 +49,16 @@
           unstable: false
           notbuilt: false
       - offline:
-          disabled: false
+          disabled: true
           execution-mode: offline-deployment
           successful: false
           failed: false
           unstable: false
           notbuilt: false
-    # just deploy phase for now and ONAP testing isn't defined yet
+
     phase:
       - deploy
+      - test
 
 
     type:
@@ -72,13 +77,16 @@
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
 
     # This should be
-    dependency-jobs: 'onap-verify-package-{distro}-{stream}'
-    dependency-job-var: 'TRIGGER_onap_verify_package_{distro}_{stream}_BUILD_RESULT'
+    dependency-jobs: 'onap-verify-tox-{stream}'
+    dependency-job-var: 'TRIGGER_onap_verify_tox_{stream}_BUILD_RESULT'
 
     jobs:
       - 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
       - 'onap-verify-{environment-type}-deploy-{distro}-{cloud}-{type}-{stream}'
       - 'onap-verify-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}'
+      - 'onap-verify-{environment-type}-xtesting-infra-healthcheck-{distro}-{cloud}-{type}-{stream}'
+      - 'onap-verify-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
+
 
 - job-template:
     name: 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
@@ -118,6 +126,10 @@
           name: EXECUTION_MODE
           default: '{execution-mode}'
           description: 'Execution mode to run in'
+      - string:
+          name: STACK_TYPE
+          default: 'onap'
+          description: 'Stack to package, deploy, test, release'
       - string:
           name: PDF
           default: '{pdf}'
@@ -138,22 +150,6 @@
           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'
@@ -226,6 +222,9 @@
     wrappers:
       - build-timeout:
           timeout: 600
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -288,6 +287,23 @@
               kill-phase-on: FAILURE
               abort-all-job: false
               property-file: $WORKSPACE/change.properties
+      - multijob:
+          name: xTesting for infra-healthcheck and healthcheck
+          condition: ALWAYS
+          projects:
+            - name: 'onap-verify-{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
+              property-file: $WORKSPACE/change.properties
+            - name: 'onap-verify-{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:
@@ -385,3 +401,81 @@
       - 'wait-pkg-mgr-macro'
       - 'download-deploy-artifact-macro'
       - 'deploy-macro'
+- job-template:
+    name: 'onap-verify-{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:
+      - 'download-xtesting-artifact-macro'
+      - 'xtesting-infra-healthcheck-macro'
+
+- job-template:
+    name: 'onap-verify-{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:
+      - 'wait-pkg-mgr-macro'
+      - 'xtesting-healthcheck-macro'
+