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'
deploy-scenario:
- k8-calico-nofeature:
phase:
- deploy:
- build-timeout: 60
+ build-timeout: 90
- functest:
build-timeout: 120
- yardstick:
build-timeout: 5
jobs:
- - '{deploy-scenario}-periodic-{os}-{type}-{stream}'
- - '{deploy-scenario}-periodic-{os}-{phase}-{type}-{stream}'
+ - '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
+ - 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
- job-template:
- name: '{deploy-scenario}-periodic-{os}-{type}-{stream}'
+ name: '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
project-type: multijob
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
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: INSTALLER_TYPE
default: '{installer-type}'
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'cloud-infra-periodic-engine-{os}-.*'
- - 'k8-.*?-periodic-.*'
+ - 'cloud-infra-periodic-engine-.*'
+ - 'k8-.*'
block-level: 'NODE'
- throttle:
max-per-node: 1
wrappers:
- build-timeout:
- timeout: 210
+ timeout: 245
- fix-workspace-permissions
scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: ''
+ wipe_workspace: true
+ clean_before: false
triggers:
- timed: '@daily'
name: deploy
condition: SUCCESSFUL
projects:
- - name: '{deploy-scenario}-periodic-{os}-deploy-{type}-{stream}'
+ - name: 'scenario-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
name: functest
condition: SUCCESSFUL
projects:
- - name: '{deploy-scenario}-periodic-{os}-functest-{type}-{stream}'
+ - name: 'scenario-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
name: yardstick
condition: SUCCESSFUL
projects:
- - name: '{deploy-scenario}-periodic-{os}-yardstick-{type}-{stream}'
+ - name: 'scenario-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
name: promote
condition: SUCCESSFUL
projects:
- - name: '{deploy-scenario}-periodic-{os}-promote-{type}-{stream}'
+ - name: 'scenario-periodic-{distro}-promote-{type}-{stream}'
current-parameters: true
predefined-parameters: |
- DISTRIBUTION=$DISTRIBUTION
+ DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
abort-all-job: true
- job-template:
- name: '{deploy-scenario}-periodic-{os}-{phase}-{type}-{stream}'
+ name: 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
disabled: false
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
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 '
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: ''
+ wipe_workspace: true
+ clean_before: false
builders:
- description-setter: