diff options
Diffstat (limited to 'jjb/armband')
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 179 | ||||
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 7 |
2 files changed, 135 insertions, 51 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 6ea73e12a..f100a46a8 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -17,23 +17,44 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# brahmaputra +# CI POD's +#-------------------------------- +# colorado #-------------------------------- pod: - - arm-pod1: + - armband-baremetal: + slave-label: armband-baremetal installer: fuel <<: *colorado - - arm-pod2: + - armband-virtual: + slave-label: armband-virtual installer: fuel <<: *colorado #-------------------------------- # master #-------------------------------- - pod: - - arm-pod1: + - armband-baremetal: + slave-label: armband-baremetal installer: fuel <<: *master + - armband-virtual: + slave-label: armband-virtual + installer: fuel + <<: *master +#-------------------------------- +# NONE-CI POD's +#-------------------------------- +# colorado +#-------------------------------- + - arm-pod2: + slave-label: arm-pod2 + installer: fuel + <<: *colorado +#-------------------------------- +# master +#-------------------------------- - arm-pod2: + slave-label: arm-pod2 installer: fuel <<: *master #-------------------------------- @@ -42,27 +63,27 @@ scenario: # HA scenarios - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l3-nofeature-ha': - auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-bgpvpn-ha': - auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' # NOHA scenarios - 'os-odl_l2-nofeature-noha': - auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' jobs: - - 'armband-{installer}-{scenario}-{pod}-daily-{stream}' - - 'armband-{installer}-deploy-{pod}-daily-{stream}' + - '{installer}-{scenario}-{pod}-daily-{stream}' + - '{installer}-deploy-{pod}-daily-{stream}' ######################## # job templates ######################## - job-template: - name: 'armband-{installer}-{scenario}-{pod}-daily-{stream}' + name: '{installer}-{scenario}-{pod}-daily-{stream}' concurrent: false @@ -75,7 +96,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'armband-{installer}-os-.*?-{pod}-daily-.*' + - '{installer}-os-.*?-{pod}-daily-.*' block-level: 'NODE' wrappers: @@ -89,7 +110,7 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults': + - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO @@ -99,7 +120,7 @@ builders: - trigger-builds: - - project: 'armband-{installer}-deploy-{pod}-daily-{stream}' + - project: '{installer}-deploy-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -116,9 +137,20 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-{installer}-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: - name: 'armband-{installer}-deploy-{pod}-daily-{stream}' + name: '{installer}-deploy-{pod}-daily-{stream}' concurrent: false @@ -131,15 +163,15 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'armband-{installer}-deploy-{pod}-daily-{stream}' - - 'armband-{installer}-deploy-generic-daily-.*' + - '{installer}-deploy-{pod}-daily-{stream}' + - '{installer}-deploy-generic-daily-.*' block-level: 'NODE' parameters: - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults': + - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO @@ -190,96 +222,141 @@ # trigger macros ######################## # CI PODs -#---------------------------------------------------------- -# Enea Armband POD 1 Triggers running against master branch -#---------------------------------------------------------- +#----------------------------------------------------------------- +# Enea Armband CI Baremetal Triggers running against master branch +#----------------------------------------------------------------- - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-master-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 3 * * 1,4' + - timed: '0 3,15 * * 1' - trigger: - name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-master-trigger' + name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 15 * * 1,4' + - timed: '0 3,15 * * 2' - trigger: - name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-master-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 3 * * 2,5' + - timed: '0 3,15 * * 3' - trigger: - name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-master-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 15 * * 2,5' + - timed: '0 3,15 * * 4' - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-master-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger' triggers: - - timed: '0 3 * * 3,6' + - timed: '0 3,15 * * 5' +#---------------------------------------------------------------------- +# Enea Armband CI Baremetal Triggers running against colorado branch +#---------------------------------------------------------------------- +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-colorado-trigger' + triggers: + - timed: '0 4,16 * * 1' +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-colorado-trigger' + triggers: + - timed: '0 4,16 * * 2' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-colorado-trigger' + triggers: + - timed: '0 4,16 * * 3' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-colorado-trigger' + triggers: + - timed: '0 4,16 * * 4' +- trigger: + name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger' + triggers: + - timed: '0 4,16 * * 5' #--------------------------------------------------------------- -# Enea Armband POD 1 Triggers running against brahmaputra branch +# Enea Armband CI Virtual Triggers running against master branch #--------------------------------------------------------------- - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-master-trigger' + triggers: + - timed: '' +#-------------------------------------------------------------------- +# Enea Armband CI Virtual Triggers running against colorado branch +#-------------------------------------------------------------------- +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger' triggers: - timed: '' #---------------------------------------------------------- # Enea Armband POD 2 Triggers running against master branch #---------------------------------------------------------- -# No triggers for master for now - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger' + name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger' triggers: - timed: '' #--------------------------------------------------------------- -# Enea Armband POD 2 Triggers running against brahmaputra branch +# Enea Armband POD 2 Triggers running against colorado branch #--------------------------------------------------------------- - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger' triggers: - timed: '' diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 901f845bf..fb4c1ead5 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -50,6 +50,13 @@ if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then echo "cloning $LAB_CONFIG_URL" git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config LAB_CONFIG_URL=file://${WORKSPACE}/lab-config + + # Source local_env if present, which contains POD-specific config + local_env="${WORKSPACE}/lab-config/labs/$LAB_NAME/$POD_NAME/fuel/config/local_env" + if [ -e $local_env ]; then + echo "-- Sourcing local environment file" + source $local_env + fi fi # releng wants us to use nothing else but opnfv.iso for now. We comply. |