diff options
| author |   Ryota Mibu <r-mibu@cq.jp.nec.com> | 2017-07-04 13:19:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-04 13:19:36 +0000 |
| commit | 0c1d6689656da269d9020e55e81f215d6f5a05a2 (patch) | |
| tree | 8ba5102d753a0d33108aef3492821c5eba7f92df /jjb | |
| parent | 52652dfc80da5267910a952272f863070a0e7a06 (diff) | |
| parent | 7f1c9abc42ab1a0a4dcd50926ecac8a57dd827eb (diff) | |
Merge "add zte-virtul3 and zte-virtul4 to Doctor CI pods"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/doctor/doctor.yml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 24 |
3 files changed, 17 insertions, 21 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 5a438e44d..c5454c799 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -17,11 +17,9 @@ installer: - apex: - slave-label: 'ool-virtual1' - pod: 'ool-virtual1' + slave-label: 'doctor-apex-verify' - fuel: - slave-label: 'ool-virtual2' - pod: 'ool-virtual2' + slave-label: 'doctor-fuel-verify' #- joid: # slave-label: 'ool-virtual3' # pod: 'ool-virtual3' diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 8de092d29..fdef6f483 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -203,10 +203,10 @@ installer: fuel <<: *danube # PODs for verify jobs triggered by each patch upload - - ool-virtual1: - slave-label: '{pod}' - installer: apex - <<: *master +# - ool-virtual1: +# slave-label: '{pod}' +# installer: apex +# <<: *master #-------------------------------- testsuite: diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 57442225c..59c5856ca 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -862,15 +862,13 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'ool-defaults' + name: 'doctor-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - ool-virtual1 - - ool-virtual2 - - ool-virtual3 + - '{default-slave}' default-slaves: - '{default-slave}' - string: @@ -882,20 +880,20 @@ default: /root/.ssh/id_rsa description: 'SSH key to be used' - parameter: - name: 'ool-virtual1-defaults' + name: 'doctor-apex-verify-defaults' parameters: - - 'ool-defaults': - default-slave: 'ool-virtual1' + - 'doctor-defaults': + default-slave: 'doctor-apex-verify' - parameter: - name: 'ool-virtual2-defaults' + name: 'doctor-fuel-verify-defaults' parameters: - - 'ool-defaults': - default-slave: 'ool-virtual2' + - 'doctor-defaults': + default-slave: 'doctor-fuel-verify' - parameter: - name: 'ool-virtual3-defaults' + name: 'doctor-joid-verify-defaults' parameters: - - 'ool-defaults': - default-slave: 'ool-virtual3' + - 'doctor-defaults': + default-slave: 'doctor-joid-verify' - parameter: name: 'multisite-virtual-defaults' parameters: |