diff options
Diffstat (limited to 'jjb/apex/apex.yml.j2')
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 184 |
1 files changed, 130 insertions, 54 deletions
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index df8cf92c0..3c36e8f62 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -6,9 +6,9 @@ - 'apex-verify-gate-{stream}' - 'apex-verify-unit-tests-{stream}' - 'apex-runner-cperf-{stream}' + - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - - 'apex-daily-master' - - 'apex-daily-danube' + - 'apex-daily-{stream}' - 'apex-csit-promote-daily-{stream}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' @@ -28,7 +28,14 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'master' - + - euphrates: &euphrates + branch: 'stable/euphrates' + gs-pathname: '/euphrates' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-odl-nofeature-ha' + scenario_stream: 'euphrates' - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -208,13 +215,8 @@ properties: - logrotate-default - - build-blocker: - use-build-blocker: true - block-level: 'NODE' - blocking-jobs: - - 'apex-verify.*' - throttle: - max-per-node: 1 + max-per-node: 3 max-total: 10 option: 'project' @@ -256,7 +258,7 @@ name: deploy-virtual condition: SUCCESSFUL projects: - - name: 'apex-deploy-virtual-{stream}' + - name: 'apex-virtual-{stream}' current-parameters: false predefined-parameters: | ARTIFACT_VERSION=$ARTIFACT_VERSION @@ -270,23 +272,6 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true - - multijob: - name: functest-smoke - condition: SUCCESSFUL - projects: - - name: 'functest-apex-virtual-suite-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={verify-scenario} - FUNCTEST_SUITE_NAME=healthcheck - 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 - abort-all-job: true - git-revision: false # Verify Scenario Gate - job-template: @@ -347,6 +332,7 @@ block-level: 'NODE' blocking-jobs: - 'apex-verify.*' + - 'apex-virtual.*' - throttle: max-per-node: 1 max-total: 10 @@ -518,6 +504,87 @@ - 'clean-workspace' +# Virtual Deploy and Test +- job-template: + name: 'apex-virtual-{stream}' + + project-type: 'multijob' + + disabled: false + + scm: + - git-scm-gerrit + + parameters: + - '{project}-defaults' + - '{project}-virtual-{stream}-defaults' + - project-parameter: + project: '{project}' + branch: '{branch}' + - apex-parameter: + gs-pathname: '{gs-pathname}' + - string: + name: DEPLOY_SCENARIO + default: '{verify-scenario}' + description: "Scenario to deploy with." + - string: + name: ARTIFACT_VERSION + default: dev + description: "Used for overriding the ARTIFACT_VERSION" + properties: + - logrotate-default + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-runner.*' + - 'apex-.*-promote.*' + - 'apex-run.*' + - 'apex-virtual-.*' + - 'apex-verify-gate-.*' + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + builders: + - description-setter: + description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" + - multijob: + name: deploy-virtual + condition: SUCCESSFUL + projects: + - name: 'apex-deploy-virtual-{stream}' + current-parameters: false + predefined-parameters: | + ARTIFACT_VERSION=$ARTIFACT_VERSION + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + OPNFV_CLEAN=yes + 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: FAILURE + abort-all-job: true + git-revision: true + - multijob: + name: functest-smoke + condition: SUCCESSFUL + projects: + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + FUNCTEST_SUITE_NAME=healthcheck + 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 + abort-all-job: true + git-revision: false + # Baremetal Deploy and Test - job-template: name: 'apex-{scenario}-baremetal-{scenario_stream}' @@ -689,10 +756,8 @@ # steps: # - shell: 'echo "Tests Passed"' -{% for stream in scenarios %} -# {{ stream }} Daily - job-template: - name: 'apex-daily-{{ stream }}' + name: 'apex-daily-{stream}' # Job template for daily build # @@ -701,7 +766,7 @@ # branch: branch (eg. stable) project-type: 'multijob' - node: '{{ build_slave[stream] }}' + node: '{baremetal-slave}' disabled: false @@ -710,25 +775,25 @@ parameters: - '{project}-defaults' - - '{project}-baremetal-{{ stream }}-defaults' + - '{project}-baremetal-{stream}-defaults' - project-parameter: project: '{project}' - branch: '{{ branch[stream] }}' + branch: '{branch}' - apex-parameter: - gs-pathname: '{{ gspathname[stream] }}' + gs-pathname: '{gs-pathname}' properties: - logrotate-default triggers: - - 'apex-{{ stream }}' + - 'apex-{stream}' builders: - multijob: name: build condition: SUCCESSFUL projects: - - name: 'apex-build-{{ stream }}' + - name: 'apex-build-{stream}' current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH @@ -743,10 +808,10 @@ name: 'Verify and upload ISO' condition: SUCCESSFUL projects: - - name: 'apex-verify-iso-{{ stream }}' + - name: 'apex-verify-iso-{stream}' current-parameters: false predefined-parameters: | - BUILD_DIRECTORY=$WORKSPACE/../apex-build-{{ stream }}/.build + BUILD_DIRECTORY=$WORKSPACE/../apex-build-{stream}/.build GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -755,21 +820,7 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true - - multijob: - name: Baremetal Deploy and Test Phase - condition: SUCCESSFUL - projects: -{% for scenario in scenarios[stream] %} - - name: 'apex-{{ scenario }}-baremetal-{{ stream }}' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false -{% endfor %} -{% endfor %} + - apex-builder-{stream} # snapshot create - job-template: @@ -1119,7 +1170,7 @@ - 'apex-run.*' triggers: - - timed: '0 12 * * *' + - timed: '0 1 * * *' builders: - description-setter: @@ -1194,6 +1245,27 @@ ######################## # builder macros ######################## +{% for stream in scenarios %} +# {{ stream }} Builder +- builder: + name: apex-builder-{{ stream }} + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: +{% for scenario in scenarios[stream] %} + - name: 'apex-{{ scenario }}-baremetal-{{ stream }}' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false +{% endfor %} +{% endfor %} + - builder: name: 'apex-unit-test' builders: @@ -1224,6 +1296,10 @@ - trigger: name: 'apex-master' triggers: + - timed: '0 3 1 1 7' +- trigger: + name: 'apex-euphrates' + triggers: - timed: '0 12 * * *' - trigger: name: 'apex-danube' |