Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update Global-jjb to master"
[releng.git]
/
jjb
/
xci
/
xci-daily-jobs.yaml
diff --git
a/jjb/xci/xci-daily-jobs.yaml
b/jjb/xci/xci-daily-jobs.yaml
index
2c692dd
..
18b20f2
100644
(file)
--- a/
jjb/xci/xci-daily-jobs.yaml
+++ b/
jjb/xci/xci-daily-jobs.yaml
@@
-17,57
+17,46
@@
# -------------------------------
scenario:
- 'os-nosdn-nofeature-noha':
# -------------------------------
scenario:
- 'os-nosdn-nofeature-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'os-nosdn-nofeature'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-nosdn-osm-noha':
deploy-scenario: 'os-nosdn-nofeature'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-nosdn-osm-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'os-nosdn-osm'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-odl-nofeature-noha':
deploy-scenario: 'os-nosdn-osm'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-odl-nofeature-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'os-odl-nofeature'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-odl-bgpvpn-noha':
deploy-scenario: 'os-odl-nofeature'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-odl-bgpvpn-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'os-odl-bgpvpn'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-odl-sfc-noha':
deploy-scenario: 'os-odl-bgpvpn'
installer-type: 'osa'
xci-flavor: 'mini'
- 'os-odl-sfc-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'os-odl-sfc'
installer-type: 'osa'
xci-flavor: 'mini'
- 'k8-nosdn-nofeature-noha':
deploy-scenario: 'os-odl-sfc'
installer-type: 'osa'
xci-flavor: 'mini'
- 'k8-nosdn-nofeature-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'k8-nosdn-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-canal-nofeature-noha':
deploy-scenario: 'k8-nosdn-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-canal-nofeature-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'k8-canal-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-calico-nofeature-noha':
deploy-scenario: 'k8-canal-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-calico-nofeature-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'k8-calico-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-contiv-nofeature-noha':
deploy-scenario: 'k8-calico-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-contiv-nofeature-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'k8-contiv-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-flannel-nofeature-noha':
deploy-scenario: 'k8-contiv-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-flannel-nofeature-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'k8-flannel-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-nosdn-istio-noha':
deploy-scenario: 'k8-flannel-nofeature'
installer-type: 'kubespray'
xci-flavor: 'mini'
- 'k8-nosdn-istio-noha':
- auto-trigger-name: 'daily-trigger-disabled'
deploy-scenario: 'k8-nosdn-istio'
installer-type: 'kubespray'
xci-flavor: 'mini'
deploy-scenario: 'k8-nosdn-istio'
installer-type: 'kubespray'
xci-flavor: 'mini'
@@
-130,9
+119,12
@@
- '^xci-functest.*'
- '^bifrost-.*periodic.*'
- '^osa-.*periodic.*'
- '^xci-functest.*'
- '^bifrost-.*periodic.*'
- '^osa-.*periodic.*'
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
- logrotate-default
- logrotate-default
+ triggers:
+ - timed: '@midnight'
+
parameters:
- string:
name: DEPLOY_SCENARIO
parameters:
- string:
name: DEPLOY_SCENARIO
@@
-146,9
+138,14
@@
- label:
name: SLAVE_LABEL
default: '{slave-label}'
- label:
name: SLAVE_LABEL
default: '{slave-label}'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
- string:
name: XCI_DISTRO
default: '{distro}'
- string:
name: XCI_DISTRO
default: '{distro}'
+ - string:
+ name: FUNCTEST_VERSION
+ default: 'hunter'
- string:
name: FUNCTEST_MODE
default: 'tier'
- string:
name: FUNCTEST_MODE
default: 'tier'
@@
-163,9
+160,6
@@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- triggers:
- - '{auto-trigger-name}'
-
wrappers:
- ssh-agent-wrapper
- build-timeout:
wrappers:
- ssh-agent-wrapper
- build-timeout:
@@
-184,6
+178,7
@@
XCI_FLAVOR=$XCI_FLAVOR
CI_LOOP=$CI_LOOP
XCI_DISTRO=$XCI_DISTRO
XCI_FLAVOR=$XCI_FLAVOR
CI_LOOP=$CI_LOOP
XCI_DISTRO=$XCI_DISTRO
+ FUNCTEST_VERSION=$FUNCTEST_VERSION
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
same-node: true
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
same-node: true
@@
-197,6
+192,7
@@
XCI_FLAVOR=$XCI_FLAVOR
CI_LOOP=$CI_LOOP
XCI_DISTRO=$XCI_DISTRO
XCI_FLAVOR=$XCI_FLAVOR
CI_LOOP=$CI_LOOP
XCI_DISTRO=$XCI_DISTRO
+ FUNCTEST_VERSION=$FUNCTEST_VERSION
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
same-node: true
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
same-node: true
@@
-243,7
+239,7
@@
- '^xci-functest.*'
- '^bifrost-.*periodic.*'
- '^osa-.*periodic.*'
- '^xci-functest.*'
- '^bifrost-.*periodic.*'
- '^osa-.*periodic.*'
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-278,6
+274,11
@@
- label:
name: SLAVE_LABEL
default: '{slave-label}'
- label:
name: SLAVE_LABEL
default: '{slave-label}'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
+ - string:
+ name: FUNCTEST_VERSION
+ default: 'hunter'
- string:
name: FUNCTEST_MODE
default: 'tier'
- string:
name: FUNCTEST_MODE
default: 'tier'
@@
-340,7
+341,9
@@
declare -x "\${var}" 2>/dev/null
echo $var
done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \
declare -x "\${var}" 2>/dev/null
echo $var
done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \
- ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml
+ ansible-playbook -i playbooks/dynamic_inventory.py \
+ -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \
+ playbooks/prepare-tests.yml
ssh root@192.168.122.2 "/root/prepare-tests.sh"
echo "---------------------------------------------------------------------------------"
ssh root@192.168.122.2 "/root/prepare-tests.sh"
echo "---------------------------------------------------------------------------------"