diff options
| -rw-r--r-- | INFO | 4 | ||||
| -rw-r--r-- | docs/etc/requirements.txt | 5 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 162 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 2 | ||||
| -rwxr-xr-x | utils/docs-build.sh | 16 |
5 files changed, 107 insertions, 82 deletions
@@ -16,8 +16,10 @@ Aric Gardner (Linux Foundation, agardner@linuxfoundation.org) Tim Rozet (Red Hat, trozet@redhat.com) Morgan Richomme (Orange, morgan.richomme@orange.com) Matthew Lijun (Huawei, matthew.lijun@huawei.com) -Peter Bandzi (Cisco, pbandzi@cisco.com) Jose Lausuch (Ericsson, jose.lausuch@ericsson.com) Ryota Mibu (NEC, r-mibu@cq.jp.nec.com) +Mei Mei (Huawei, meimei@huawei.com) Link to TSC approval of the project: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html +Link to TSC voting for removal of Victor Laza as committer: http://meetbot.opnfv.org/meetings/opnfv-meeting/2016/opnfv-meeting.2016-02-16-14.59.html +Link to nomination and acceptance of Mei Mei as committer: http://lists.opnfv.org/pipermail/opnfv-tsc/2016-March/002228.html diff --git a/docs/etc/requirements.txt b/docs/etc/requirements.txt index 4df3b687d..4b1850729 100644 --- a/docs/etc/requirements.txt +++ b/docs/etc/requirements.txt @@ -1 +1,6 @@ +Sphinx==1.3.1 +doc8 +docutils +setuptools +six sphinxcontrib-httpdomain diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 2c1a4ab54..e1816b528 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -48,22 +48,22 @@ #-------------------------------- scenario: # HA scenarios + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-onos-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-sfc-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-kvm-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-ovs-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-odl_l2-bgpvpn-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-odl_l2-sfc-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-kvm_ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': @@ -232,10 +232,88 @@ # trigger macros ######################## # os-nosdn-nofeature-ha trigger +# CI PODs +#----------------------------------------------- +# LF POD2 Triggers running against master branch +#----------------------------------------------- - trigger: name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger' triggers: + - timed: '0 0 * * *' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 3 * * *' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 6 * * *' +- trigger: + name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 9 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 15 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 21 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger' + triggers: + - timed: '' +#----------------------------------------------- +# Ericsson POD2 Triggers running against brahmaputra branch +#----------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 15 * * *' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 21 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 0 * * *' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 3 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 6 * * *' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 9 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger' + triggers: - timed: '' +#----------------------------------------------- +# Triggers for other PODs +#----------------------------------------------- - trigger: name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -257,20 +335,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-nosdn-kvm-ha trigger - trigger: - name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -291,20 +361,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-odl_l2-nofeature-ha trigger - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -319,13 +381,9 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-brahmaputra-trigger' triggers: - - timed: '0 4,10,16,22 * * *' -- trigger: - name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger' - triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -335,10 +393,6 @@ # os-odl_l3-nofeature-ha trigger - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -359,20 +413,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-onos-nofeature-ha trigger - trigger: - name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -393,10 +439,6 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' @@ -404,10 +446,6 @@ # os-nosdn-ovs-ha trigger - trigger: - name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -428,20 +466,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-odl_l2-bgpvpn-ha trigger - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -462,20 +492,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-odl_l2-sfc-ha trigger - trigger: - name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -496,20 +518,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-sfc-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-nosdn-kvm-ha trigger - trigger: - name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -530,10 +544,6 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-kvm-noha-virtual-brahmaputra-trigger' triggers: - timed: '' diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 6e4c178d4..f06bf7077 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -120,7 +120,7 @@ # install python packages easy_install -U setuptools - #python setup.py develop + easy_install -U pip pip install -r ci/requirements.txt pip install -e . diff --git a/utils/docs-build.sh b/utils/docs-build.sh index 4d95836d5..48037db2e 100755 --- a/utils/docs-build.sh +++ b/utils/docs-build.sh @@ -14,6 +14,7 @@ INDEX_RST=${INDEX_RST:-index.rst} BUILD_DIR=${BUILD_DIR:-docs_build} OUTPUT_DIR=${OUTPUT_DIR:-docs_output} SRC_DIR=${SRC_DIR:-$BUILD_DIR/_src} +VENV_DIR=${VENV_DIR:-$BUILD_DIR/_venv} RELENG_DIR=${RELENG_DIR:-releng} GERRIT_COMMENT=${GERRIT_COMMENT:-} @@ -48,10 +49,6 @@ opnfv_logo='releng/docs/etc/opnfv-logo.png' function check_rst_doc() { _src="$1" - if ! which doc8 > /dev/null ; then - echo "Error: 'doc8' not found. Exec 'sudo pip install doc8' first." - exit 1 - fi # Note: This check may fail in many jobs for building project docs, since # the old sample has lines more than 120. We ignore failures on this # check right now, but these have to be fixed before OPNFV B release. @@ -140,6 +137,15 @@ fi prepare_src_files +if ! which virtualenv > /dev/null ; then + echo "Error: 'virtualenv' not found. Exec 'sudo pip install virtualenv' first." + exit 1 +fi + +virtualenv "$VENV_DIR" +source "$VENV_DIR/bin/activate" +pip install -r "$RELENG_DIR/docs/etc/requirements.txt" + find $DOCS_DIR -name $INDEX_RST -printf '%h\n' | while read dir do name=$(generate_name $dir) @@ -224,3 +230,5 @@ do fi done + +deactivate |