X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=8bddd1fa51a62b97ed58e3c7ebbaba0ff7a36ffe;hb=c057cb46031607f1be118a118e25fb402275c750;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..8bddd1fa 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml @@ -60,11 +60,20 @@ dib_os_element: 'centos-minimal' type: - - virtual + - virtual: + slave-label: 'vpod-deploy-city' + yardstick-dispatcher: 'file' + - baremetal: + slave-label: 'baremetal-deploy' + yardstick-dispatcher: 'influxdb' phase: - - deploy - - test + - deploy: + build-timeout: 60 + - functest: + build-timeout: 120 + - yardstick: + build-timeout: 30 jobs: - 'cloud-infra-periodic-engine-{os}-{type}-{stream}' @@ -86,12 +95,16 @@ - nordix-gerrit-parameters - label: name: SLAVE_LABEL - default: 'vpod-deploy-{os}' + default: '{slave-label}' description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' - string: name: DISTRIBUTION default: '{distribution}' description: 'Distribution to use for configuring target nodes (networking etc.)' + - string: + name: DEPLOY_TYPE + default: '{type}' + description: 'Type of the deployment' - string: name: USE_PREBUILT_DEPLOYMENT_IMAGE default: 'true' @@ -108,6 +121,18 @@ 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: 'smoke' + description: 'Test suite to run' + - string: + name: YARDSTICK_DISPATCHER + default: '{yardstick-dispatcher}' + description: 'Dispatcher to use for Yardstick reporting' - string: name: CLEANUP default: 'true' @@ -119,6 +144,7 @@ use-build-blocker: true blocking-jobs: - 'cloud-infra-verify-engine-{os}-.*' + - 'cloud-infra-verify-scenario-{os}-.*' - 'cloud-infra-periodic-engine-{os}-.*' - 'cloud-infra-os-.*' - 'cloud-infra-k8-.*' @@ -130,10 +156,8 @@ wrappers: - build-timeout: - timeout: 120 + timeout: 210 - fix-workspace-permissions - - openstack: - single-use: True scm: - git-scm: @@ -142,7 +166,7 @@ refspec: '' triggers: - - timed: 'H H/2 * * *' + - timed: 'H H/3 * * *' builders: - multijob: @@ -153,31 +177,48 @@ current-parameters: true predefined-parameters: | DISTRIBUTION=$DISTRIBUTION + DEPLOY_TYPE=$DEPLOY_TYPE 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 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_TYPE=$DEPLOY_TYPE + 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_TYPE=$DEPLOY_TYPE + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + TEST_SUITE=$TEST_SUITE + YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER + CLEANUP=$CLEANUP + node-parameters: true + kill-phase-on: NEVER + abort-all-job: false - job-template: name: 'cloud-infra-periodic-{os}-{phase}-{type}-{stream}' @@ -197,6 +238,10 @@ name: DISTRIBUTION default: 'ubuntu18' description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.' + - string: + name: DEPLOY_TYPE + default: 'virtual' + description: 'Type of the deployment. Overriden by upstream job.' - string: name: USE_PREBUILT_DEPLOYMENT_IMAGE default: 'false' @@ -213,17 +258,37 @@ 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: 'smoke' + description: 'Test suite to run' - string: name: TEST_REPO_URL default: 'https://gerrit.nordix.org/infra/test.git' description: 'URL to Nordix Cloud Infra test repository' + - string: + name: YARDSTICK_DISPATCHER + default: 'file' + description: 'Dispatcher to use for Yardstick reporting' - string: name: CLEANUP default: 'false' wrappers: - build-timeout: - timeout: 120 + timeout: '{build-timeout}' - fix-workspace-permissions scm: @@ -233,26 +298,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: