diff options
Diffstat (limited to 'jjb/xci')
| -rw-r--r-- | jjb/xci/bifrost-periodic-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/xci/bifrost-verify-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/xci/osa-periodic-jobs.yaml | 6 | ||||
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 12 | ||||
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yaml | 8 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 4 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yaml | 6 |
7 files changed, 32 insertions, 12 deletions
diff --git a/jjb/xci/bifrost-periodic-jobs.yaml b/jjb/xci/bifrost-periodic-jobs.yaml index fbe2e205a..4c61be193 100644 --- a/jjb/xci/bifrost-periodic-jobs.yaml +++ b/jjb/xci/bifrost-periodic-jobs.yaml @@ -82,7 +82,7 @@ - '^xci-functest.*' - '^bifrost-.*periodic.*' - '^osa-.*periodic.*' - block-level: 'NODE' + blocking-level: 'NODE' - logrotate-default parameters: @@ -122,6 +122,8 @@ - label: name: SLAVE_LABEL default: '{slave-label}' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: CI_LOOP default: 'periodic' diff --git a/jjb/xci/bifrost-verify-jobs.yaml b/jjb/xci/bifrost-verify-jobs.yaml index 4ca783524..f895cf672 100644 --- a/jjb/xci/bifrost-verify-jobs.yaml +++ b/jjb/xci/bifrost-verify-jobs.yaml @@ -80,7 +80,7 @@ - xci-verify-virtual option: category - block-level: 'NODE' + blocking-level: 'NODE' parameters: - string: @@ -128,6 +128,8 @@ - label: name: SLAVE_LABEL default: 'xci-virtual' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: CI_LOOP default: 'verify' diff --git a/jjb/xci/osa-periodic-jobs.yaml b/jjb/xci/osa-periodic-jobs.yaml index 6c2d165a4..b731bf52b 100644 --- a/jjb/xci/osa-periodic-jobs.yaml +++ b/jjb/xci/osa-periodic-jobs.yaml @@ -58,7 +58,7 @@ - 'bifrost-periodic-{distro}-.*' - 'xci-osa-verify-{distro}-.*' - 'xci-osa-periodic-{distro}-.*' - block-level: 'NODE' + blocking-level: 'NODE' - throttle: max-per-node: 2 max-total: 10 @@ -82,6 +82,8 @@ - label: name: SLAVE_LABEL default: 'xci-virtual' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: OPENSTACK_OSA_VERSION default: 'master' @@ -144,7 +146,7 @@ blocking-jobs: - '.*-bifrost-verify-.*' - '.*-bifrost-periodic-.*' - block-level: 'NODE' + blocking-level: 'NODE' parameters: - project-parameter: diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index fcd4465cb..18b20f2ac 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -119,7 +119,7 @@ - '^xci-functest.*' - '^bifrost-.*periodic.*' - '^osa-.*periodic.*' - block-level: 'NODE' + blocking-level: 'NODE' - logrotate-default triggers: @@ -138,6 +138,8 @@ - label: name: SLAVE_LABEL default: '{slave-label}' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: XCI_DISTRO default: '{distro}' @@ -237,7 +239,7 @@ - '^xci-functest.*' - '^bifrost-.*periodic.*' - '^osa-.*periodic.*' - block-level: 'NODE' + blocking-level: 'NODE' - throttle: enabled: true max-per-node: 1 @@ -272,6 +274,8 @@ - label: name: SLAVE_LABEL default: '{slave-label}' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: FUNCTEST_VERSION default: 'hunter' @@ -337,7 +341,9 @@ 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 "---------------------------------------------------------------------------------" diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml index a499ec9be..c468be6d1 100644 --- a/jjb/xci/xci-merge-jobs.yaml +++ b/jjb/xci/xci-merge-jobs.yaml @@ -108,6 +108,8 @@ - label: name: SLAVE_LABEL default: 'xci-virtual' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: CI_LOOP default: 'merge' @@ -228,7 +230,7 @@ - 'openstack-bifrost-verify-{distro}-.*' - 'xci-osa-verify-{distro}-.*' - 'xci-osa-periodic-{distro}-.*' - block-level: 'NODE' + blocking-level: 'NODE' - throttle: max-per-node: 1 max-total: 3 @@ -252,6 +254,8 @@ - label: name: SLAVE_LABEL default: 'xci-virtual' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: CI_LOOP default: 'merge' @@ -353,7 +357,7 @@ - '.*-bifrost-periodic-.*' - 'osa-verify-.*' - 'osa-periodic-.*' - block-level: 'NODE' + blocking-level: 'NODE' parameters: - string: diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 992194ca3..610268c28 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -49,7 +49,9 @@ export XCI_VENV=${XCI_PATH}/venv ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; \ while read var; do declare -x \"\${var}\" 2>/dev/null; done < ${XCI_PATH}/.cache/xci.env && \ - cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml" + cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py \ + -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ + playbooks/prepare-tests.yml" echo "Prepare OPNFV VM for Tests" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/prepare-tests.sh" echo "Running Functest" diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml index 47ae4f8e2..9edf55597 100644 --- a/jjb/xci/xci-verify-jobs.yaml +++ b/jjb/xci/xci-verify-jobs.yaml @@ -72,7 +72,7 @@ - 'openstack-bifrost-verify-{distro}-.*' - 'xci-osa-verify-{distro}-.*' - 'xci-osa-periodic-{distro}-.*' - block-level: 'NODE' + blocking-level: 'NODE' - throttle: max-per-node: 2 max-total: 10 @@ -140,6 +140,8 @@ - label: name: SLAVE_LABEL default: 'xci-virtual' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: DISTRO default: '{distro}' @@ -243,7 +245,7 @@ - '.*-bifrost-periodic-.*' - 'osa-verify-.*' - 'osa-periodic-.*' - block-level: 'NODE' + blocking-level: 'NODE' parameters: - string: |