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=167bc7655fe144530bd28b19d2306601092b2c5f;hpb=3bae112f304e7d84fdcc1c6fc09e5eed58f15e14;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 167bc7655..5e8234f7e 100644 --- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml +++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml @@ -25,13 +25,20 @@ stream: - 'master': branch: '{stream}' - deploy-scenario: 'onap-sdc-full' + k8s-version: 'master' + deploy-scenario: 'onap-full-nofeature' + - 'guilin': + branch: '{stream}' + k8s-version: '1.15' + deploy-scenario: 'onap-full-nofeature' - 'frankfurt': branch: '{stream}' - deploy-scenario: 'onap-sdc-full' + k8s-version: '1.15' + deploy-scenario: 'onap-sdc-nofeature' - 'elalto': branch: '{stream}' - deploy-scenario: 'onap-sdc-full' + k8s-version: '1.15' + deploy-scenario: 'onap-sdc-nofeature' environment-type: - online: @@ -42,7 +49,7 @@ unstable: false notbuilt: false - offline: - disabled: false + disabled: true execution-mode: offline-deployment successful: false failed: false @@ -51,14 +58,15 @@ phase: - deploy - - functest + - test + type: - cloud: provisioner-type: 'heat' slave-type: 'jumphost' gated-projects: 'infra/stack/onap|infra/installer/oom' - pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804.yaml" + pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804-onap.yaml" idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml" distro: @@ -68,12 +76,17 @@ - city: openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' - dependency-jobs: 'onap-verify-package-{distro}-{stream}' - dependency-job-var: 'TRIGGER_onap_verify_package_{distro}_{stream}_BUILD_RESULT' + # This should be + 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}-{phase}-{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}' @@ -89,6 +102,14 @@ name: DEPLOY_SCENARIO default: '{deploy-scenario}' description: 'Scenario to test change with.' + - string: + name: K8S_VERSION + default: '{k8s-version}' + description: 'K8S version to use for this deployment' + - string: + name: INVENTORY_INI + default: /tmp/inventory.ini + description: 'Location of the inventory file. Copied from k8s install' - string: name: DISTRO default: '{distro}' @@ -105,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}' @@ -125,25 +150,9 @@ 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: 'true' + default: 'false' description: 'Delete the stack upon completion of the build' - string: name: VERBOSITY @@ -212,7 +221,10 @@ wrappers: - build-timeout: - timeout: 180 + timeout: 600 + - ssh-agent-credentials: + users: + - 'nordixinfra-nordix-gerrit-ssh' - credentials-binding: - file: credential-id: '{openrc-credentials-file}' @@ -255,12 +267,20 @@ builders: - 'generate-change-metadata-macro' + - 'generate-k8sdeployment-environment-macro' - multijob: name: "{environment-type} deployment on {type} instances" condition: SUCCESSFUL - execution-type: PARALLEL + execution-type: SEQUENTIALLY projects: - - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}' + - name: 'onap-verify-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}' + current-parameters: true + git-revision: true + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: false + property-file: $WORKSPACE/k8s.properties + - name: 'onap-verify-{environment-type}-deploy-{distro}-{cloud}-{type}-{stream}' current-parameters: true git-revision: true node-parameters: true @@ -268,18 +288,22 @@ abort-all-job: false property-file: $WORKSPACE/change.properties - multijob: - name: "{environment-type} testing on {type} instances" - condition: SUCCESSFUL - execution-type: PARALLEL + name: xTesting for infra-healthcheck and healthcheck + condition: ALWAYS projects: - - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-{stream}' + - name: 'onap-verify-{environment-type}-xtesting-infra-healthcheck-{distro}-{cloud}-{type}-{stream}' current-parameters: true - git-revision: false + 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: @@ -295,7 +319,7 @@ - 'delete-stack-macro' - job-template: - name: 'onap-verify-{environment-type}-{phase}-{distro}-{cloud}-{type}-{stream}' + name: 'onap-verify-{environment-type}-deploy-{distro}-{cloud}-{type}-{stream}' disabled: '{obj:disabled}' @@ -318,7 +342,7 @@ wrappers: - build-timeout: - timeout: 180 + timeout: 600 - credentials-binding: - file: credential-id: '{openrc-credentials-file}' @@ -333,5 +357,125 @@ builders: - 'generate-ssh-keypair-macro' - 'wait-pkg-mgr-macro' - - 'download-{phase}-artifact-macro' - - '{phase}-macro' + - 'download-deploy-artifact-macro' + - 'deploy-macro' + +- job-template: + name: 'onap-verify-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - logrotate + - throttle: + max-per-node: 1 + max-total: 3 + option: project + + scm: + - git-scm-gerrit: + ssh-credentials-id: nordixinfra-nordix-gerrit-ssh + branch: $GERRIT_BRANCH + refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false + + wrappers: + - build-timeout: + timeout: 600 + - credentials-binding: + - file: + credential-id: '{openrc-credentials-file}' + variable: OPENRC_FILE + - username-password-separated: + credential-id: 'nordix-cicd-arm-credentials' + username: NORDIX_ARM_USERNAME + password: NORDIX_ARM_TOKEN + - mask-passwords + - fix-workspace-permissions + + builders: + - 'generate-ssh-keypair-macro' + - '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' +