diff options
Diffstat (limited to 'jjb/apex/apex.yaml')
| -rw-r--r-- | jjb/apex/apex.yaml | 149 |
1 files changed, 124 insertions, 25 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index c7c938569..80a4d82f5 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -8,7 +8,7 @@ - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - 'apex-daily-{stream}' - - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' + - 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -254,6 +254,11 @@ - 'ha' - 'noha-allinone' + snap_type: + - csit: + sdn: 'odl' + - functest: + sdn: 'nosdn' # Fetch Logs Job - job-template: name: 'apex-fetch-logs-{stream}' @@ -839,7 +844,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' + name: 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' # Job template for promoting CSIT Snapshots # @@ -883,6 +888,10 @@ name: FORCE_PROMOTE default: 'False' description: "Used to force promotion and skip CSIT" + - string: + name: SNAP_TYPE + default: '{snap_type}' + description: Type of snapshot to promote properties: - build-blocker: use-build-blocker: true @@ -891,7 +900,7 @@ - 'apex-verify.*' - 'apex-runner.*' - 'apex-daily.*' - - 'apex-csit-promote.*' + - 'apex-.*-promote.*' - 'odl-netvirt.*' - throttle: max-per-node: 1 @@ -899,7 +908,7 @@ option: 'project' triggers: - - '{stream}-{os_version}' + - '{stream}-{snap_type}-{os_version}' builders: - multijob: @@ -909,7 +918,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology} + DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -930,7 +939,7 @@ abort-all-job: true git-revision: false - multijob: - name: csit + name: test phase condition: SUCCESSFUL execution-type: SEQUENTIALLY projects: @@ -943,16 +952,36 @@ ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION SKIP_CSIT=$FORCE_PROMOTE + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: NEVER abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" - name: cperf-upload-logs-csit predefined-parameters: | ODL_BRANCH=$ODL_BRANCH OS_VERSION=$OS_VERSION + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: FAILURE abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG + FUNCTEST_SUITE_NAME=tempest_smoke + FUNCTEST_MODE=testcase + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + enable-condition: "def m = '$SNAP_TYPE' ==~ /functest/" + abort-all-job: true + git-revision: false - name: 'apex-fetch-logs-{stream}' current-parameters: false predefined-parameters: | @@ -970,8 +999,6 @@ projects: - name: 'apex-create-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -982,8 +1009,6 @@ projects: - name: 'apex-upload-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -2014,76 +2039,150 @@ - timed: '0 3 1 1 7' - trigger: - name: 'master-master' + name: 'master-csit-master' triggers: - timed: '0 5 * * *' - trigger: - name: 'master-rocky' + name: 'master-csit-rocky' triggers: - timed: '0 5 * * *' - trigger: - name: 'master-queens' + name: 'master-csit-queens' triggers: - timed: '' - trigger: - name: 'gambia-master' + name: 'gambia-csit-master' triggers: - timed: '' - trigger: - name: 'gambia-rocky' + name: 'gambia-csit-rocky' triggers: - timed: '' - trigger: - name: 'gambia-queens' + name: 'gambia-csit-queens' triggers: - timed: '0 5 * * *' - trigger: - name: 'fraser-master' + name: 'fraser-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-queens' + triggers: + - timed: '' +- trigger: + name: 'master-functest-master' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-rocky' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-queens' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-rocky' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-queens' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'fraser-functest-master' triggers: - timed: '' - trigger: - name: 'fraser-rocky' + name: 'fraser-functest-rocky' triggers: - timed: '' - trigger: - name: 'fraser-queens' + name: 'fraser-functest-queens' triggers: - timed: '' - trigger: - name: 'euphrates-master' + name: 'euphrates-functest-master' triggers: - timed: '' - trigger: - name: 'euphrates-rocky' + name: 'euphrates-functest-rocky' triggers: - timed: '' - trigger: - name: 'euphrates-queens' + name: 'euphrates-functest-queens' triggers: - timed: '' - trigger: - name: 'danube-master' + name: 'danube-functest-master' triggers: - timed: '' - trigger: - name: 'danube-rocky' + name: 'danube-functest-rocky' triggers: - timed: '' - trigger: - name: 'danube-queens' + name: 'danube-functest-queens' triggers: - timed: '' |