diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 81 | ||||
| -rw-r--r-- | jjb/armband/armband-project-jobs.yml | 6 |
2 files changed, 45 insertions, 42 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 03c1fb074..6ea73e12a 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -2,7 +2,6 @@ - project: name: 'armband-ci' project: 'armband' - installer: 'fuel' #-------------------------------- # BRANCH ANCHORS @@ -11,8 +10,8 @@ stream: master branch: '{stream}' gs-pathname: '' - brahmaputra: &brahmaputra - stream: brahmaputra + colorado: &colorado + stream: colorado branch: 'stable/{stream}' gs-pathname: '/{stream}' #-------------------------------- @@ -22,16 +21,20 @@ #-------------------------------- pod: - arm-pod1: - <<: *brahmaputra + installer: fuel + <<: *colorado - arm-pod2: - <<: *brahmaputra + installer: fuel + <<: *colorado #-------------------------------- # master #-------------------------------- pod: - arm-pod1: + installer: fuel <<: *master - arm-pod2: + installer: fuel <<: *master #-------------------------------- # scenarios @@ -39,27 +42,27 @@ scenario: # HA scenarios - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l3-nofeature-ha': - auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-bgpvpn-ha': - auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' # NOHA scenarios - 'os-odl_l2-nofeature-noha': - auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger' jobs: - - 'armband-{scenario}-{pod}-daily-{stream}' - - 'armband-deploy-{pod}-daily-{stream}' + - 'armband-{installer}-{scenario}-{pod}-daily-{stream}' + - 'armband-{installer}-deploy-{pod}-daily-{stream}' ######################## # job templates ######################## - job-template: - name: 'armband-{scenario}-{pod}-daily-{stream}' + name: 'armband-{installer}-{scenario}-{pod}-daily-{stream}' concurrent: false @@ -72,7 +75,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'armband-os-.*?-{pod}-daily-{stream}' + - 'armband-{installer}-os-.*?-{pod}-daily-.*' block-level: 'NODE' wrappers: @@ -96,7 +99,7 @@ builders: - trigger-builds: - - project: 'armband-deploy-{pod}-daily-{stream}' + - project: 'armband-{installer}-deploy-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -115,7 +118,7 @@ unstable-threshold: 'FAILURE' - job-template: - name: 'armband-deploy-{pod}-daily-{stream}' + name: 'armband-{installer}-deploy-{pod}-daily-{stream}' concurrent: false @@ -128,8 +131,8 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'armband-deploy-{pod}-daily-{stream}' - - 'armband-deploy-generic-daily-.*' + - 'armband-{installer}-deploy-{pod}-daily-{stream}' + - 'armband-{installer}-deploy-generic-daily-.*' block-level: 'NODE' parameters: @@ -162,7 +165,7 @@ publishers: - email: - recipients: josep.puigdemont@enea.com armband@enea.com + recipients: armband@enea.com ######################## # parameter macros @@ -191,46 +194,46 @@ # Enea Armband POD 1 Triggers running against master branch #---------------------------------------------------------- - trigger: - name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-master-trigger' triggers: - timed: '0 3 * * 1,4' - trigger: - name: 'armband-os-nosdn-nofeature-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-master-trigger' triggers: - timed: '0 15 * * 1,4' - trigger: - name: 'armband-os-odl_l3-nofeature-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-master-trigger' triggers: - timed: '0 3 * * 2,5' - trigger: - name: 'armband-os-odl_l2-bgpvpn-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-master-trigger' triggers: - timed: '0 15 * * 2,5' - trigger: - name: 'armband-os-odl_l2-nofeature-noha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-master-trigger' triggers: - timed: '0 3 * * 3,6' #--------------------------------------------------------------- # Enea Armband POD 1 Triggers running against brahmaputra branch #--------------------------------------------------------------- - trigger: - name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-nosdn-nofeature-ha-arm-pod1-brahmaputra-trigger' + name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l3-nofeature-ha-arm-pod1-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l2-bgpvpn-ha-arm-pod1-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l2-nofeature-noha-arm-pod1-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-colorado-trigger' triggers: - timed: '' #---------------------------------------------------------- @@ -238,45 +241,45 @@ #---------------------------------------------------------- # No triggers for master for now - trigger: - name: 'armband-os-odl_l2-nofeature-ha-arm-pod2-master-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-nosdn-nofeature-ha-arm-pod2-master-trigger' + name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l3-nofeature-ha-arm-pod2-master-trigger' + name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger' + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l2-nofeature-noha-arm-pod2-master-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger' triggers: - timed: '' #--------------------------------------------------------------- # Enea Armband POD 2 Triggers running against brahmaputra branch #--------------------------------------------------------------- - trigger: - name: 'armband-os-odl_l2-nofeature-ha-arm-pod2-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-nosdn-nofeature-ha-arm-pod2-brahmaputra-trigger' + name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l3-nofeature-ha-arm-pod2-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l2-bgpvpn-ha-arm-pod2-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-os-odl_l2-nofeature-noha-arm-pod2-brahmaputra-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger' triggers: - timed: '' diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml index 46cc76b2a..10f8d6531 100644 --- a/jjb/armband/armband-project-jobs.yml +++ b/jjb/armband/armband-project-jobs.yml @@ -11,13 +11,13 @@ jobs: - 'armband-verify-{stream}' - - 'armband-build-daily-{stream}' + - 'armband-{installer}-build-daily-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -64,7 +64,7 @@ echo "Nothing to verify!" - job-template: - name: 'armband-build-daily-{stream}' + name: 'armband-{installer}-build-daily-{stream}' concurrent: false |