summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex.yml166
1 files changed, 24 insertions, 142 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index ac1ef499b..9ce83316b 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -10,9 +10,6 @@
- 'apex-deploy-virtual-{scenario}-{stream}'
- 'apex-deploy-baremetal-{scenario}-{stream}'
- 'apex-daily-{stream}'
- - 'apex-daily-colorado'
- - 'apex-build-colorado'
- - 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
- 'apex-csit-promote-daily-{stream}'
- 'apex-fdio-promote-daily-{stream}'
@@ -25,6 +22,12 @@
slave: 'lf-pod1'
verify-slave: 'apex-verify-master'
daily-slave: 'apex-daily-master'
+ - danube:
+ branch: 'stable/danube'
+ gs-pathname: '/danube'
+ slave: 'lf-pod1'
+ verify-slave: 'apex-verify-master'
+ daily-slave: 'apex-daily-master'
project: 'apex'
@@ -35,6 +38,8 @@
- 'os-nosdn-ovs-noha'
- 'os-nosdn-fdio-noha'
- 'os-nosdn-fdio-ha'
+ - 'os-nosdn-kvm-ha'
+ - 'os-nosdn-kvm-noha'
- 'os-odl_l2-fdio-noha'
- 'os-odl_l2-fdio-ha'
- 'os-odl_l2-netvirt_gbp_fdio-noha'
@@ -766,143 +771,10 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
-
-# Colorado Build
-- job-template:
- name: 'apex-build-colorado'
-
- # Job template for builds
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
- node: 'apex-daily-colorado'
-
- disabled: false
-
- concurrent: true
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: 'stable/colorado'
- - apex-parameter:
- gs-pathname: '/colorado'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from parameters macro."
-
- scm:
- - git-scm
-
- properties:
- - logrotate-default
- - build-blocker:
- use-build-blocker: true
- block-level: 'NODE'
- blocking-jobs:
- - 'apex-deploy.*'
- - throttle:
- max-per-node: 1
- max-total: 10
- option: 'project'
-
- builders:
- - 'apex-build'
- - 'apex-upload-artifact'
-
-
-# Colorado FDIO Deploy
-- job-template:
- name: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
-
- # Job template for baremetal deployment
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
- node: 'lf-pod1'
-
- disabled: false
-
- scm:
- - git-scm
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: 'stable/colorado'
- - apex-parameter:
- gs-pathname: '/colorado'
- - string:
- name: DEPLOY_SCENARIO
- default: 'os-odl_l2-fdio-ha'
- description: "Scenario to deploy with."
-
- properties:
- - logrotate-default
- - build-blocker:
- use-build-blocker: true
- block-level: 'NODE'
- blocking-jobs:
- - 'apex-verify.*'
- - 'apex-deploy.*'
- - 'apex-build.*'
-
-
- builders:
- - 'apex-deploy'
- - 'apex-workspace-cleanup'
-
-# Colorado FDIO Daily
-- job-template:
- name: 'apex-daily-colorado'
-
- # Job template for daily build
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
- node: 'apex-daily-colorado'
-
- disabled: false
-
- scm:
- - git-scm
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: 'stable/colorado'
- - apex-parameter:
- gs-pathname: '/colorado'
-
- properties:
- - logrotate-default
- - build-blocker:
- use-build-blocker: true
- block-level: 'NODE'
- blocking-jobs:
- - 'apex-verify.*'
- - 'apex-deploy.*'
- - 'apex-build.*'
- - 'apex-runner.*'
-
- triggers:
- - 'apex-colorado'
-
- builders:
- - trigger-builds:
- - project: 'apex-build-colorado'
- git-revision: true
- current-parameters: true
- same-node: true
- block: true
- trigger-builds:
- - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
+ - project: 'apex-deploy-baremetal-os-nosdn-kvm-ha-{stream}'
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-colorado/.build
+ BUILD_DIRECTORY=apex-build-{stream}/.build
OPNFV_CLEAN=yes
git-revision: true
same-node: true
@@ -910,9 +782,19 @@
build-step-failure-threshold: 'never'
block: true
- trigger-builds:
- - project: 'functest-apex-apex-daily-colorado-daily-colorado'
+ - project: 'functest-apex-{daily-slave}-daily-{stream}'
predefined-parameters:
- DEPLOY_SCENARIO=os-odl_l2-fdio-ha
+ DEPLOY_SCENARIO=os-nosdn-kvm-ha
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-apex-{slave}-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-nosdn-kvm-ha
block: true
same-node: true
block-thresholds:
@@ -1134,9 +1016,9 @@
- trigger:
name: 'apex-master'
triggers:
- - timed: '0 3 * * *'
+ - timed: '0 3 * * 7'
- trigger:
- name: 'apex-colorado'
+ name: 'apex-danube'
triggers:
- timed: '0 12 * * *'
- trigger: