X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=4e0ced5297d9f2c6cceac36e3766a7413095ebb4;hb=175d55d67c5e93307acc66fd6f661118d3dbb6f0;hp=2291089ae414cd27f46f3536242d68dc05ac766f;hpb=745e77be18c1b55cfad46f72291c0b3a5aee0b28;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 2291089a..4e0ced52 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml @@ -45,34 +45,36 @@ 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' - centos7: disabled: 'true' - distribution: 'centos7' - ipa_dib_os_element: 'coreos' - dib_os_release: '7' - dib_os_element: 'centos-minimal' type: - - virtual + - virtual: + slave-label: 'vpod-deploy-city' + yardstick-dispatcher: 'file' + build-trigger: 'H H/3 * * *' + - baremetal: + slave-label: 'baremetal-deploy' + yardstick-dispatcher: 'influxdb' + build-trigger: '@daily' phase: - - deploy - - functest - - yardstick + - deploy: + build-timeout: 60 + - 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,36 +89,36 @@ - nordix-gerrit-parameters - label: name: SLAVE_LABEL - default: 'vpod-deploy-city' + 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: YARDSTICK_DISPATCHER + default: '{yardstick-dispatcher}' + description: 'Dispatcher to use for Yardstick reporting' - string: name: CLEANUP default: 'true' @@ -127,10 +129,10 @@ - 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-.*' + - 'k8-.*' block-level: 'NODE' - throttle: max-per-node: 1 @@ -139,7 +141,7 @@ wrappers: - build-timeout: - timeout: 120 + timeout: 210 - fix-workspace-permissions scm: @@ -149,21 +151,20 @@ refspec: '' 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 @@ -174,12 +175,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 + YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER @@ -188,19 +192,22 @@ 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 + 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}' + name: 'cloud-infra-periodic-{distro}-{phase}-{type}-{stream}' disabled: false @@ -214,29 +221,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.' - - 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.' - string: name: ENGINE_ANSIBLE_PARAMS default: ' -v ' description: 'Extra paramters that can be added when run the play books.' + - string: + name: INSTALLER_TYPE + default: 'kubespray' + description: 'Installer to use for deploying the scenario' - string: name: DEPLOY_SCENARIO default: 'k8-calico-nofeature' @@ -247,19 +250,23 @@ 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: 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: