diff options
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 2 | ||||
| -rw-r--r-- | jjb/auto/auto.yaml | 28 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yaml | 11 | ||||
| -rw-r--r-- | jjb/functest/functest-virtual.yaml | 2 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 15 |
7 files changed, 50 insertions, 12 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 15e68261a..c10a7836e 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -174,6 +174,8 @@ - compare-type: ANT pattern: 'apex/build/**' - compare-type: ANT + pattern: 'apex/builders/**' + - compare-type: ANT pattern: 'apex/common/**' - compare-type: ANT pattern: 'apex/inventory/**' diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index a5af63cb5..23a1daf0f 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -918,7 +918,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology} + DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 2e507fb09..451274cf1 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -764,7 +764,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology} + DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index abba9c8d3..ccf723f01 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -45,6 +45,7 @@ jobs: - '{installer}-{scenario}-{pod}-auto-daily-{stream}' - '{installer}-deploy-{pod}-daily-{stream}' + - 'auto-daily-{stream}' - 'auto-verify-{stream}' - 'auto-merge-{stream}' @@ -101,6 +102,33 @@ block: true - job-template: + name: 'auto-daily-{stream}' + + disabled: '{obj:disabled}' + + properties: + - logrotate-default + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'auto-daily-.*' + blocking-level: 'NODE' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'intel-pod18-defaults' + + triggers: + - timed: '0 16 * * *' + + builders: + - shell: | + pwd + ./ci/build-auto.sh daily + +- job-template: name: 'auto-verify-{stream}' disabled: '{obj:disabled}' diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index aeeb29f21..deccc32a4 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -23,7 +23,6 @@ installer: - 'apex' - 'fuel' - - 'daisy' arch: - 'x86_64' @@ -36,12 +35,6 @@ exclude: - installer: 'apex' arch: 'aarch64' - - installer: 'daisy' - arch: 'aarch64' - # disabling the following tests due to limitation of PoD owners - # these would beenabled again once the PoDs are ready - - installer: 'fuel' - arch: 'x86_64' jobs: - 'doctor-verify-{stream}' @@ -76,7 +69,7 @@ name: 'doctor-verify-sample' execution-type: PARALLEL projects: - - name: 'doctor-verify-fault_management-daisy-sample-x86_64-{stream}' + - name: 'doctor-verify-all-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -85,7 +78,7 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true - - name: 'doctor-verify-all-apex-sample-x86_64-{stream}' + - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml index 79f551e30..7276699f9 100644 --- a/jjb/functest/functest-virtual.yaml +++ b/jjb/functest/functest-virtual.yaml @@ -406,7 +406,7 @@ - builder: name: run-tox builders: - - shell: tox + - shell: tox -e docs,pep8,pylint,yamllint,bashate,py27,cover - job-template: name: '{repo}-functest-{tag}-ut-gate' diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 30ecd2a03..e62a75c66 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -793,6 +793,21 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'intel-pod18-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod18 + default-slaves: + - intel-pod18 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: name: 'huawei-pod3-defaults' parameters: - node: |