Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
use `bash` to parse shell
[releng.git]
/
jjb
/
doctor
/
doctor.yaml
diff --git
a/jjb/doctor/doctor.yaml
b/jjb/doctor/doctor.yaml
index
3eef018
..
c66624c
100644
(file)
--- a/
jjb/doctor/doctor.yaml
+++ b/
jjb/doctor/doctor.yaml
@@
-11,19
+11,16
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- - gambia: &gambia
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- - fraser:
+ - hunter:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
installer:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
installer:
- - 'apex'
- - 'fuel'
- - 'daisy'
+ - 'apex':
+ scenario: 'os-nosdn-nofeature-noha'
+ - 'fuel':
+ scenario: 'os-nosdn-nofeature-noha'
arch:
- 'x86_64'
arch:
- 'x86_64'
@@
-36,8
+33,6
@@
exclude:
- installer: 'apex'
arch: 'aarch64'
exclude:
- installer: 'apex'
arch: 'aarch64'
- - installer: 'daisy'
- arch: 'aarch64'
jobs:
- 'doctor-verify-{stream}'
jobs:
- 'doctor-verify-{stream}'
@@
-64,15
+59,15
@@
builders:
- shell: |
builders:
- shell: |
- #!/bin/bash
- # we do nothing here as the main stuff will be done
- # in phase jobs
- echo "Triggering phase jobs!"
+
#!/bin/bash
+
# we do nothing here as the main stuff will be done
+
# in phase jobs
+
echo "Triggering phase jobs!"
- multijob:
name: 'doctor-verify-sample'
execution-type: PARALLEL
projects:
- multijob:
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
predefined-parameters: |
PROJECT=$PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-81,7
+76,7
@@
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
git-revision: true
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
predefined-parameters: |
PROJECT=$PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-90,7
+85,11
@@
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
git-revision: true
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
git-revision: true
- - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
+ - multijob:
+ name: 'doctor-verify-fenix'
+ execution-type: PARALLEL
+ projects:
+ - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
predefined-parameters: |
PROJECT=$PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-129,7
+128,9
@@
- 'doctor-slave-parameter'
- 'doctor-parameter':
inspector: '{inspector}'
- 'doctor-slave-parameter'
- 'doctor-parameter':
inspector: '{inspector}'
+ scenario: '{scenario}'
test_case: 'fault_management'
test_case: 'fault_management'
+ admin_tool_type: 'sample'
scm:
- git-scm-gerrit
builders:
scm:
- git-scm-gerrit
builders:
@@
-140,7
+141,7
@@
- job-template:
name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
disabled: '{obj:disabled}'
- job-template:
name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
disabled: '{obj:disabled}'
- node: '
nokia-pod1
'
+ node: '
doctor-{installer}-{arch}
'
wrappers:
- ssh-agent-wrapper
- build-timeout:
wrappers:
- ssh-agent-wrapper
- build-timeout:
@@
-153,7
+154,9
@@
- 'doctor-slave-parameter'
- 'doctor-parameter':
inspector: '{inspector}'
- 'doctor-slave-parameter'
- 'doctor-parameter':
inspector: '{inspector}'
+ scenario: '{scenario}'
test_case: 'maintenance'
test_case: 'maintenance'
+ admin_tool_type: 'fenix'
scm:
- git-scm-gerrit
builders:
scm:
- git-scm-gerrit
builders:
@@
-177,7
+180,9
@@
- 'doctor-slave-parameter'
- 'doctor-parameter':
inspector: '{inspector}'
- 'doctor-slave-parameter'
- 'doctor-parameter':
inspector: '{inspector}'
+ scenario: '{scenario}'
test_case: 'all'
test_case: 'all'
+ admin_tool_type: 'sample'
scm:
- git-scm-gerrit
builders:
scm:
- git-scm-gerrit
builders:
@@
-200,6
+205,14
@@
name: TEST_CASE
default: '{test_case}'
description: 'test case: all, fault_management or maintenance'
name: TEST_CASE
default: '{test_case}'
description: 'test case: all, fault_management or maintenance'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: '{scenario}'
+ description: 'Scenario to deploy and test'
+ - string:
+ name: ADMIN_TOOL_TYPE
+ default: '{admin_tool_type}'
+ description: 'admin_tool_type: sample, fenix'
# -------------------------------
# -------------------------------
@@
-210,17
+223,18
@@
name: 'doctor-verify-installer-inspector-builders-macro'
builders:
# yamllint disable rule:indentation
name: 'doctor-verify-installer-inspector-builders-macro'
builders:
# yamllint disable rule:indentation
- - shell:
- !include-raw:
- - ./doctor-env-presetup.sh
- - ../../utils/fetch_os_creds.sh
+ - shell: !include-raw:
+ - ./doctor-env-presetup.sh
+ - ../../utils/fetch_os_creds.sh
- shell: |
- shell: |
+ #!/bin/bash
+
# prepare the env for test
# prepare the env for test
-
source
$HOME/opnfv-openrc.sh
+
.
$HOME/opnfv-openrc.sh
if [ -f $HOME/os_cacert ]; then
export OS_CACERT=$HOME/os_cacert
fi
if [ -f $HOME/os_cacert ]; then
export OS_CACERT=$HOME/os_cacert
fi
-
source
$HOME/opnfv-installer.sh
+
.
$HOME/opnfv-installer.sh
# run tox to trigger the test
# As Jenkins user, it has no permission to send ICMP package
# run tox to trigger the test
# As Jenkins user, it has no permission to send ICMP package