X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-scenario.yaml;h=d42580980c62c5e43447dc177b45f776dffa7c53;hb=49f4b27599f664b519129c10dbfdad15193d154a;hp=537fe292eaaf247a83e0be314c60e7c5ea691837;hpb=0bb08d016530d758d66b47ca43dabe1bef8567f3;p=infra%2Fcicd.git diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml index 537fe292..d4258098 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml @@ -45,19 +45,14 @@ 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' + + ci-loop: + - daily deploy-scenario: - k8-calico-nofeature: @@ -72,28 +67,31 @@ installer-type: kubespray - k8-multus-nofeature: installer-type: kubespray + - os-nosdn-nofeature: + installer-type: kolla type: - baremetal: slave-label: 'baremetal-deploy' yardstick-dispatcher: 'influxdb' + provisioner-type: 'bifrost' phase: - deploy: - build-timeout: 60 + build-timeout: 90 - functest: - build-timeout: 120 + build-timeout: 240 - yardstick: - build-timeout: 30 + build-timeout: 120 - promote: build-timeout: 5 jobs: - - '{deploy-scenario}-periodic-{os}-{type}-{stream}' - - 'scenario-periodic-{os}-{phase}-{type}-{stream}' + - '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}' + - 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}' - job-template: - name: '{deploy-scenario}-periodic-{os}-{type}-{stream}' + name: '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}' project-type: multijob @@ -111,8 +109,8 @@ 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 @@ -123,17 +121,9 @@ 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: PROVISIONER_TYPE + default: '{provisioner-type}' + description: 'Provisioner to use for provisioning nodes' - string: name: INSTALLER_TYPE default: '{installer-type}' @@ -160,8 +150,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'cloud-infra-periodic-engine-{os}-.*' - - 'k8-.*?-periodic-.*' + - 'cloud-infra-periodic-engine-.*' + - 'k8-.*' + - 'os-.*' block-level: 'NODE' - throttle: max-per-node: 1 @@ -170,7 +161,7 @@ wrappers: - build-timeout: - timeout: 210 + timeout: 455 - fix-workspace-permissions scm: @@ -178,26 +169,26 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - timed: '@daily' builders: - description-setter: - description: $INSTALLER_TYPE + description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO - multijob: name: deploy condition: SUCCESSFUL projects: - - name: 'scenario-periodic-{os}-deploy-{type}-{stream}' + - name: 'scenario-{distro}-deploy-{type}-{ci-loop}-{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 + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO CLEANUP=$CLEANUP @@ -209,11 +200,12 @@ name: functest condition: SUCCESSFUL projects: - - name: 'scenario-periodic-{os}-functest-{type}-{stream}' + - name: 'scenario-{distro}-functest-{type}-{ci-loop}-{stream}' current-parameters: true predefined-parameters: | - DISTRIBUTION=$DISTRIBUTION + DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE @@ -226,11 +218,12 @@ name: yardstick condition: SUCCESSFUL projects: - - name: 'scenario-periodic-{os}-yardstick-{type}-{stream}' + - name: 'scenario-{distro}-yardstick-{type}-{ci-loop}-{stream}' current-parameters: true predefined-parameters: | - DISTRIBUTION=$DISTRIBUTION + DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE @@ -243,11 +236,12 @@ name: promote condition: SUCCESSFUL projects: - - name: 'scenario-periodic-{os}-promote-{type}-{stream}' + - name: 'scenario-{distro}-promote-{type}-{ci-loop}-{stream}' current-parameters: true predefined-parameters: | - DISTRIBUTION=$DISTRIBUTION + DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE @@ -258,7 +252,7 @@ abort-all-job: true - job-template: - name: 'scenario-periodic-{os}-{phase}-{type}-{stream}' + name: 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}' disabled: false @@ -272,8 +266,8 @@ 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 @@ -283,18 +277,6 @@ 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 ' @@ -303,6 +285,10 @@ name: DEPLOY_SCENARIO default: 'k8-calico-nofeature' description: 'Scenario to deploy and test' + - string: + name: PROVISIONER_TYPE + default: 'bifrost' + description: 'Provisioner to use for provisioning nodes' - string: name: INSTALLER_TYPE default: 'kubespray' @@ -337,10 +323,12 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false builders: - description-setter: - description: $INSTALLER_TYPE - $DEPLOY_SCENARIO + description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO - 'scenario-{phase}-macro' # vim: set ts=2 sw=2 expandtab: