X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=c6fb7e14264e7a20229bcc825cd8a4da20d73369;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=cbf2f14cd9dae32b24d3af542f93a1dc56a5ea85;hpb=deedd614369b138fd880a72556828dc25d448c2c;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 cbf2f14c..c6fb7e14 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml @@ -43,36 +43,33 @@ stream: - 'master': branch: '{stream}' - disabled: 'false' - os: + distro: - ubuntu1804: - disabled: 'false' - distribution: 'ubuntu18' - ipa_dib_os_element: 'coreos' - dib_os_release: 'bionic' - dib_os_element: 'ubuntu-minimal' + slave-label: vpod-deploy-ubuntu1804 - centos7: - disabled: 'true' - distribution: 'centos7' - ipa_dib_os_element: 'coreos' - dib_os_release: '7' - dib_os_element: 'centos-minimal' + slave-label: vpod-deploy-centos7 type: - - virtual + - virtual: + yardstick-dispatcher: 'file' + build-trigger: 'H H/3 * * *' + disabled: true phase: - - deploy - - functest - - yardstick + - deploy: + build-timeout: 90 + - functest: + build-timeout: 120 + - yardstick: + build-timeout: 30 jobs: - - 'cloud-infra-periodic-engine-{os}-{type}-{stream}' - - 'cloud-infra-periodic-{os}-{phase}-{type}-{stream}' + - 'cloud-infra-periodic-engine-{distro}-{type}-{stream}' + - 'cloud-infra-periodic-{distro}-{phase}-{type}-{stream}' - job-template: - name: 'cloud-infra-periodic-engine-{os}-{type}-{stream}' + name: 'cloud-infra-periodic-engine-{distro}-{type}-{stream}' project-type: multijob @@ -87,50 +84,49 @@ - 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}' + name: DISTRO + default: '{distro}' 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' description: 'Use prebuilt deployment image while running as part of CI/CD' - string: - name: IPA_DIB_OS_ELEMENT - default: '{ipa_dib_os_element}' - description: 'DIB OS Element to use for building the ramdisk image' - - string: - name: DIB_OS_RELEASE - default: '{dib_os_release}' - description: 'DIB OS Release to use for building the deployment image to provision target nodes with' - - string: - name: DIB_OS_ELEMENT - default: '{dib_os_element}' - description: 'DIB OS Element to use for building the deployment image to provision target nodes with' + name: INSTALLER_TYPE + default: 'kubespray' + description: 'Installer to use for deploying the scenario' - string: name: DEPLOY_SCENARIO default: 'k8-calico-nofeature' description: 'Scenario to deploy and test' - string: name: TEST_SUITE - default: 'healthcheck' + default: 'smoke' description: 'Test suite to run' - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' + name: YARDSTICK_DISPATCHER + default: '{yardstick-dispatcher}' + description: 'Dispatcher to use for Yardstick reporting' properties: - logrotate - build-blocker: use-build-blocker: true blocking-jobs: - - 'cloud-infra-verify-engine-{os}-.*' - - 'cloud-infra-periodic-engine-{os}-.*' - - 'cloud-infra-os-.*' - - 'cloud-infra-k8-.*' + - 'cloud-infra-verify-engine-.*' + - 'cloud-infra-verify-scenario-.*' + - 'cloud-infra-periodic-engine-.*' + - 'onap-.*' + - 'k8-.*' + - 'os-.*' + - 'nolabs-.*' block-level: 'NODE' - throttle: max-per-node: 1 @@ -139,35 +135,33 @@ wrappers: - build-timeout: - timeout: 120 + timeout: 240 - fix-workspace-permissions - - openstack: - single-use: True scm: - git-scm: ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - - timed: 'H H/2 * * *' + - timed: '{build-trigger}' builders: - multijob: name: deploy condition: SUCCESSFUL projects: - - name: 'cloud-infra-periodic-{os}-deploy-{type}-{stream}' + - name: 'cloud-infra-periodic-{distro}-deploy-{type}-{stream}' current-parameters: true predefined-parameters: | - DISTRIBUTION=$DISTRIBUTION + DISTRO=$DISTRO + 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 + INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - CLEANUP=$CLEANUP git-revision: true node-parameters: true kill-phase-on: FAILURE @@ -176,13 +170,15 @@ name: functest condition: ALWAYS projects: - - name: 'cloud-infra-periodic-{os}-functest-{type}-{stream}' + - name: 'cloud-infra-periodic-{distro}-functest-{type}-{stream}' current-parameters: true predefined-parameters: | - DISTRIBUTION=$DISTRIBUTION + DISTRO=$DISTRO + DEPLOY_TYPE=$DEPLOY_TYPE + INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE - CLEANUP=$CLEANUP + YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -190,21 +186,23 @@ name: yardstick condition: ALWAYS projects: - - name: 'cloud-infra-periodic-{os}-yardstick-{type}-{stream}' + - name: 'cloud-infra-periodic-{distro}-yardstick-{type}-{stream}' current-parameters: true predefined-parameters: | - DISTRIBUTION=$DISTRIBUTION + DISTRO=$DISTRO + DEPLOY_TYPE=$DEPLOY_TYPE + INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE - CLEANUP=$CLEANUP + YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER node-parameters: true kill-phase-on: NEVER abort-all-job: false - job-template: - name: 'cloud-infra-periodic-{os}-{phase}-{type}-{stream}' + name: 'cloud-infra-periodic-{distro}-{phase}-{type}-{stream}' - disabled: false + disabled: true concurrent: true @@ -216,25 +214,25 @@ name: PROJECT default: $GERRIT_PROJECT - string: - name: DISTRIBUTION - default: 'ubuntu18' + name: DISTRO + default: 'ubuntu1804' 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' description: 'Use prebuilt deployment image while running as part of CI/CD' - string: - name: IPA_DIB_OS_ELEMENT - default: 'fedora' - description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.' - - string: - name: DIB_OS_RELEASE - default: 'bionic' - description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.' + name: ENGINE_ANSIBLE_PARAMS + default: ' -v ' + description: 'Extra paramters that can be added when run the play books.' - string: - 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.' + name: INSTALLER_TYPE + default: 'kubespray' + description: 'Installer to use for deploying the scenario' - string: name: DEPLOY_SCENARIO default: 'k8-calico-nofeature' @@ -245,19 +243,20 @@ description: 'Test framework to use' - string: name: TEST_SUITE - default: 'healthcheck' + 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: CLEANUP - default: 'false' + name: YARDSTICK_DISPATCHER + default: 'file' + description: 'Dispatcher to use for Yardstick reporting' wrappers: - build-timeout: - timeout: 120 + timeout: '{build-timeout}' - fix-workspace-permissions scm: @@ -265,36 +264,10 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false 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-functest-macro' - builders: - - shell: - !include-raw: ./prepare-for-test.sh - - shell: - !include-raw: ./cloud-infra-test.sh - -- builder: - name: 'cloud-infra-periodic-yardstick-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: