Current doctor verify jobs need to be run on relevant pods which are
specified by slave-label. But, after multijob introduced, the parameter
is not passed to children jobs. Also, 'phase' of project is misleading,
as it isn't multijob's phase.
This patch makes sure each doctor job run on correct pod by updating
node label rule for doctor pod to 'doctor-{installer}-{arch}'.
This patch also merges doctor slave parameter definitions into one,
and deletes unnecessary setting where default are set.
Change-Id: Ic9bf218ae7fb4f9866b510efd1e0ccd19277b78e
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
disabled: false
installer:
disabled: false
installer:
- - apex:
- slave-label: 'doctor-apex-verify'
- - fuel:
- slave-label: 'doctor-fuel-verify'
- # - joid:
- # slave-label: 'ool-virtual3'
- # pod: 'ool-virtual3'
+ - 'apex'
+ - 'fuel'
+ # - 'joid'
- phase:
- - 'build-x86_64':
- slave-label: 'doctor-{installer}-verify'
- - 'build-aarch64':
- slave-label: 'doctor-{installer}-{phase}-verify'
+ arch:
+ - 'x86_64'
+ - 'aarch64'
exclude:
- installer: 'apex'
exclude:
- installer: 'apex'
jobs:
- 'doctor-verify-{stream}'
- 'doctor-verify-unit-test-{stream}'
- 'doctor-{task}-{inspector}-{stream}'
jobs:
- 'doctor-verify-{stream}'
- 'doctor-verify-unit-test-{stream}'
- 'doctor-{task}-{inspector}-{stream}'
- - 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
+ - 'doctor-{task}-{installer}-{inspector}-{arch}-{stream}'
- job-template:
name: 'doctor-verify-{stream}'
- job-template:
name: 'doctor-verify-{stream}'
disabled: '{obj:disabled}'
disabled: '{obj:disabled}'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
triggers:
- gerrit:
server-name: 'gerrit.opnfv.org'
triggers:
- gerrit:
server-name: 'gerrit.opnfv.org'
file-paths:
- compare-type: ANT
pattern: 'doctor_tests/**'
file-paths:
- compare-type: ANT
pattern: 'doctor_tests/**'
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash
execution-type: PARALLEL
projects:
- name: 'doctor-verify-unit-test-{stream}'
execution-type: PARALLEL
projects:
- name: 'doctor-verify-unit-test-{stream}'
- current-parameters: false
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- job-template:
name: 'doctor-verify-unit-test-{stream}'
- job-template:
name: 'doctor-verify-unit-test-{stream}'
- job-template:
name: 'doctor-{task}-{inspector}-{stream}'
- job-template:
name: 'doctor-{task}-{inspector}-{stream}'
disabled: '{obj:disabled}'
disabled: '{obj:disabled}'
triggers:
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
files: 'doctor_tests/**'
triggers:
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
files: 'doctor_tests/**'
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash
name: 'doctor-verify-apex-inspector'
execution-type: PARALLEL
projects:
name: 'doctor-verify-apex-inspector'
execution-type: PARALLEL
projects:
- - name: 'doctor-{task}-apex-{inspector}-build-x86_64-{stream}'
- current-parameters: false
+ - name: 'doctor-{task}-apex-{inspector}-x86_64-{stream}'
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- multijob:
name: 'doctor-verify-fuel-inspector'
execution-type: PARALLEL
projects:
- multijob:
name: 'doctor-verify-fuel-inspector'
execution-type: PARALLEL
projects:
- - name: 'doctor-{task}-fuel-{inspector}-build-x86_64-{stream}'
- current-parameters: false
+ - name: 'doctor-{task}-fuel-{inspector}-x86_64-{stream}'
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- multijob:
name: 'doctor-verify-fuel-inspector'
execution-type: PARALLEL
projects:
- multijob:
name: 'doctor-verify-fuel-inspector'
execution-type: PARALLEL
projects:
- - name: 'doctor-{task}-fuel-{inspector}-build-aarch64-{stream}'
- current-parameters: false
+ - name: 'doctor-{task}-fuel-{inspector}-aarch64-{stream}'
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- name: 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
+ name: 'doctor-{task}-{installer}-{inspector}-{arch}-{stream}'
disabled: '{obj:disabled}'
disabled: '{obj:disabled}'
+ node: 'doctor-{installer}-{arch}'
wrappers:
- ssh-agent-wrapper
- build-timeout:
wrappers:
- ssh-agent-wrapper
- build-timeout:
project: '{project}'
branch: '{branch}'
- '{installer}-defaults'
project: '{project}'
branch: '{branch}'
- '{installer}-defaults'
- - '{slave-label}-defaults'
+ - 'doctor-slave-parameter'
- 'doctor-parameter'
- 'doctor-functest-parameter'
scm:
- 'doctor-parameter'
- 'doctor-functest-parameter'
scm:
description: 'Git URL to use on this Jenkins Slave'
- parameter:
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'doctor-defaults'
+ name: 'doctor-slave-parameter'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
+ - 'doctor-apex-x86_64'
+ - 'doctor-fuel-x86_64'
+ - 'doctor-fuel-aarch64'
+ - 'doctor-joid-x86_64'
+ - 'not-specified'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
default: /root/.ssh/id_rsa
description: 'SSH key to be used'
default: /root/.ssh/id_rsa
description: 'SSH key to be used'
-- parameter:
- name: 'doctor-apex-verify-defaults'
- parameters:
- - 'doctor-defaults':
- default-slave: 'doctor-apex-verify'
-
-- parameter:
- name: 'doctor-fuel-verify-defaults'
- parameters:
- - 'doctor-defaults':
- default-slave: 'doctor-fuel-verify'
-
-- parameter:
- name: 'doctor-fuel-build-aarch64-verify-defaults'
- parameters:
- - 'doctor-defaults':
- default-slave: 'doctor-fuel-build-aarch64-verify'
-
-- parameter:
- name: 'doctor-joid-verify-defaults'
- parameters:
- - 'doctor-defaults':
- default-slave: 'doctor-joid-verify'
-
- parameter:
name: 'multisite-virtual-defaults'
parameters:
- parameter:
name: 'multisite-virtual-defaults'
parameters: