Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove unneeded doc generation script from functest-verify job
[releng.git]
/
jjb
/
functest
/
functest.yml
diff --git
a/jjb/functest/functest.yml
b/jjb/functest/functest.yml
index
3a63f0f
..
56119bd
100644
(file)
--- a/
jjb/functest/functest.yml
+++ b/
jjb/functest/functest.yml
@@
-18,24
+18,30
@@
installer_type: 'apex'
installer_ip: '192.168.X.X'
- compass:
installer_type: 'apex'
installer_ip: '192.168.X.X'
- compass:
- node: 'huawei-us'
+ node: 'huawei-us
-deploy-bare-1
'
installer_type: 'compass'
installer_ip: '192.168.200.2'
installer_type: 'compass'
installer_ip: '192.168.200.2'
+ - joid:
+ node: 'intel-us-deploy-bare-pod5'
+ installer_type: 'compass'
+ installer_ip: '127.0.0.1'
pod:
pod:
- - opnfv-jump-1:
- node: 'opnfv-jump-1'
- installer_type: 'apex'
- installer_ip: '192.168.X.X'
-
- orange-test1:
node: 'orange-test1'
installer_type: 'fuel'
installer_ip: '172.30.10.73'
- orange-test1:
node: 'orange-test1'
installer_type: 'fuel'
installer_ip: '172.30.10.73'
-
- orange-fr-pod2:
node: 'orange-fr-pod2'
installer_type: 'joid'
installer_ip: '127.0.0.1'
- orange-fr-pod2:
node: 'orange-fr-pod2'
installer_type: 'joid'
installer_ip: '127.0.0.1'
+ - huawei-build:
+ node: 'huawei-us-deploy-bare-1'
+ installer_type: 'compass'
+ installer_ip: '192.168.200.2'
+ - intel-us-deploy-bare-pod5:
+ node: 'intel-us-deploy-bare-pod5'
+ installer_type: 'joid'
+ installer_ip: '127.0.0.1'
jobs:
- 'set-functest-env-{pod}'
jobs:
- 'set-functest-env-{pod}'
@@
-71,7
+77,7
@@
- job-template:
name: set-functest-env-{pod}
- job-template:
name: set-functest-env-{pod}
- node: '{
pod
}'
+ node: '{
node
}'
builders:
- 'set-functest-env'
builders:
- 'set-functest-env'
@@
-79,7
+85,7
@@
- job-template:
name: clean-functest-env-{pod}
- job-template:
name: clean-functest-env-{pod}
- node: '{
pod
}'
+ node: '{
node
}'
builders:
- 'functest-cleanup'
builders:
- 'functest-cleanup'
@@
-103,7
+109,7
@@
- job-template:
name: functest-openstack-bench-test-{pod}
- job-template:
name: functest-openstack-bench-test-{pod}
- node: '{
pod
}'
+ node: '{
node
}'
builders:
- 'functest-rally-bench'
builders:
- 'functest-rally-bench'
@@
-111,7
+117,7
@@
- job-template:
name: functest-openstack-tempest-smoke-test-{pod}
- job-template:
name: functest-openstack-tempest-smoke-test-{pod}
- node: '{
pod
}'
+ node: '{
node
}'
builders:
- 'functest-tempest-smoke'
builders:
- 'functest-tempest-smoke'
@@
-119,7
+125,7
@@
- job-template:
name: functest-odl-test-{pod}
- job-template:
name: functest-odl-test-{pod}
- node: '{
pod
}'
+ node: '{
node
}'
builders:
- shell: |
builders:
- shell: |
@@
-128,7
+134,7
@@
- job-template:
name: functest-vping-test-{pod}
- job-template:
name: functest-vping-test-{pod}
- node: '{
pod
}'
+ node: '{
node
}'
builders:
- 'functest-vping'
builders:
- 'functest-vping'
@@
-136,7
+142,7
@@
- job-template:
name: functest-{pod}
- job-template:
name: functest-{pod}
- node: '{
pod
}'
+ node: '{
node
}'
parameters:
- project-parameter:
parameters:
- project-parameter:
@@
-300,7
+306,7
@@
builders:
- shell:
builders:
- shell:
- !include-raw ../opnfvdocs/docu-build.sh
+ echo "Hello World"
- job-template:
name: 'functest-merge-{stream}'
- job-template:
name: 'functest-merge-{stream}'
@@
-380,10
+386,22
@@
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
description: "Override GIT_BASE"
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
description: "Override GIT_BASE"
+
+- parameter:
+ name: huawei-build
+ parameters:
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "Override GIT_BASE"
+
+- parameter:
+ name: intel-us-deploy-bare-pod5
+ parameters:
- string:
- string:
- name:
SSH_KEY
- default:
"/root/.ssh/id_rsa"
- description: "
SSH public key to access the installer VM"
+ name:
GIT_BASE
+ default:
https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "
Override GIT_BASE"
- parameter:
name: opnfv-jump-2
- parameter:
name: opnfv-jump-2
@@
-430,6
+448,7
@@
if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \
|sed 's/.*192/192/g' | sed 's/\ in.*//g')
if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \
|sed 's/.*192/192/g' | sed 's/\ in.*//g')
+ sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
fi
echo "Functest: Start Docker and prepare environment"
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
fi
echo "Functest: Start Docker and prepare environment"
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
@@
-439,9
+458,6
@@
if [ -n "${LAB_CONFIG}" ]; then
labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
fi
if [ -n "${LAB_CONFIG}" ]; then
labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
fi
- if [ -n "${SSH_KEY}" ]; then
- sshkey="-v ${SSH_KEY}:/root/.ssh/id_rsa"
- fi
docker pull opnfv/functest:latest_stable
cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"
docker pull opnfv/functest:latest_stable
cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"