X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-engine.yaml;h=e9a1aa417bc84394647bf57f76bfb40d61d48931;hb=f6d92e9bc27e865592a14b06a269d6f14ea21bbf;hp=ff36fae1a93055af281f298954e842fa0a68bebe;hpb=0c0e67aaf375e2e26e3cfa97037d628e4a96c122;p=infra%2Fcicd.git diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml index ff36fae1..e9a1aa41 100644 --- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml @@ -50,21 +50,20 @@ 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' + disabled: false + successful: false + failed: false + unstable: false + notbuilt: false - centos7: - disabled: 'true' - distribution: 'centos7' - ipa_dib_os_element: 'coreos' - dib_os_release: '7' - dib_os_element: 'centos-minimal' + disabled: true + successful: true + failed: true + unstable: true + notbuilt: true type: - virtual @@ -74,11 +73,11 @@ - functest jobs: - - 'cloud-infra-verify-engine-{os}-{type}-{stream}' - - 'cloud-infra-verify-{os}-{phase}-{type}-{stream}' + - 'cloud-infra-verify-engine-{distro}-{type}-{stream}' + - 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}' - job-template: - name: 'cloud-infra-verify-engine-{os}-{type}-{stream}' + name: 'cloud-infra-verify-engine-{distro}-{type}-{stream}' project-type: multijob @@ -93,36 +92,28 @@ - nordix-gerrit-parameters - label: name: SLAVE_LABEL - default: 'vpod-deploy-{os}' + default: 'vpod-deploy-city' 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' - - string: - name: DEPLOY_SCENARIO - default: 'k8-calico-nofeature' - description: 'Scenario to deploy and test' - 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: CLEANUP default: 'true' @@ -133,10 +124,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 @@ -147,34 +138,56 @@ - build-timeout: timeout: 120 - fix-workspace-permissions - - openstack: - single-use: True scm: - git-scm-gerrit: ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - - nordix-gerrit-trigger-patchset-created: - project: 'infra\/engine' - branch: '{branch}' - files: '**' + - gerrit: + server-name: 'Nordix Gerrit' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'REG_EXP' + project-pattern: 'infra\/engine' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: 'ANT' + pattern: '**' + skip-vote: + successful: '{obj:successful}' + failed: '{obj:failed}' + unstable: '{obj:unstable}' + notbuilt: '{obj:notbuilt}' + custom-url: '* $JOB_NAME $BUILD_URL' builders: + - 'cloud-infra-determine-scenario-macro' - multijob: name: deploy condition: SUCCESSFUL projects: - - name: 'cloud-infra-verify-{os}-deploy-{type}-{stream}' + - name: 'cloud-infra-verify-engine-{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 CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -188,16 +201,14 @@ name: functest condition: SUCCESSFUL projects: - - name: 'cloud-infra-verify-{os}-functest-{type}-{stream}' + - name: 'cloud-infra-verify-engine-{distro}-functest-{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 - DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE + YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -209,7 +220,7 @@ abort-all-job: true - job-template: - name: 'cloud-infra-verify-{os}-{phase}-{type}-{stream}' + name: 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}' disabled: false @@ -223,29 +234,17 @@ 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: DEPLOY_SCENARIO - default: 'k8-calico-nofeature' - description: 'Scenario to deploy and test' - string: name: TEST_FW default: '{phase}' @@ -258,6 +257,10 @@ 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' @@ -272,8 +275,11 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false builders: + - 'cloud-infra-determine-scenario-macro' - 'cloud-infra-{phase}-macro' # vim: set ts=2 sw=2 expandtab: