diff options
| -rw-r--r-- | jjb/auto/auto.yaml | 122 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 11 |
3 files changed, 133 insertions, 4 deletions
diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index c28dc5618..a454fc4e8 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -1,8 +1,126 @@ --- +# jenkins job templates for Auto - project: - name: auto + name: 'auto-ci-jobs' + project: 'auto' - project: '{name}' + # ------------------------------- + # BRANCH ANCHORS + # ------------------------------- + master: &master + stream: master + branch: '{stream}' + gs-pathname: '' + disabled: false + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + # ------------------------------- + # DEPLOY TYPE ANCHORS + # ------------------------------- + baremetal: &baremetal + installer: 'fuel' + slave-label: 'auto-baremetal' + # ------------------------------- + # POD, INSTALLER, AND BRANCH MAPPING + # ------------------------------- + # CI POD's + # ------------------------------- + # fraser + # ------------------------------- + pod: + # yamllint disable rule:key-duplicates + - auto-baremetal: + <<: *baremetal + <<: *fraser + # ------------------------------- + # master + # ------------------------------- + - auto-baremetal: + <<: *baremetal + <<: *master + # yamllint enable rule:key-duplicates + # ------------------------------- + # scenarios + # ------------------------------- + scenario: + # HA scenarios + - 'os-nosdn-onap-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' jobs: + - '{installer}-{scenario}-{pod}-auto-daily-{stream}' + - '{installer}-deploy-{pod}-daily-{stream}' - '{project}-verify-basic' + +######################## +# job templates +######################## +- job-template: + name: '{installer}-{scenario}-{pod}-auto-daily-{stream}' + + disabled: '{obj:disabled}' + + concurrent: false + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{installer}-os-.*?-{pod}-auto-daily-.*' + block-level: 'NODE' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + triggers: + - '{auto-trigger-name}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults': + gs-pathname: '{gs-pathname}' + - '{slave-label}-defaults': + installer: '{installer}' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + + builders: + - trigger-builds: + - project: '{installer}-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO='os-nosdn-nofeature-ha' + same-node: true + block: true + +######################## +# trigger macros +######################## +# CI PODs +# ---------------------------------------------------------------- +# Auto CI Baremetal Triggers running against master branch +# ---------------------------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-onap-ha-auto-baremetal-master-trigger' + triggers: + - timed: '0 1 * * *' +# --------------------------------------------------------------------- +# Auto CI Baremetal Triggers running against fraser branch +# --------------------------------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-onap-ha-auto-baremetal-fraser-trigger' + triggers: + - timed: '' diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 35bf3dc01..433061a96 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -55,8 +55,8 @@ if [ "${PROJECT}" = 'fuel' ]; then fi else SUDO= - # Armband currently supports arm, enea labs - if [[ ! "${LAB_NAME}" =~ (arm|enea) ]]; then + # Armband currently supports arm, enea, unh labs + if [[ ! "${LAB_NAME}" =~ (arm|enea|unh) ]]; then echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!" exit 1 fi diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 9d8bed45f..0219be54b 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -278,6 +278,17 @@ description: 'Base URI to the configuration directory' - parameter: + name: 'auto-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'auto-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: name: 'joid-baremetal-defaults' parameters: - label: |