diff options
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 4 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 4 | ||||
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 72 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-run-suite.sh | 17 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-dovetail-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 2 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 4 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 21 | ||||
| -rw-r--r-- | jjb/functest/functest-alpine.sh | 1 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 9 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 2 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 12 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yml | 14 | ||||
| -rw-r--r-- | utils/push-test-logs.sh | 2 | ||||
| -rw-r--r-- | utils/test/reporting/docker/Dockerfile | 17 | ||||
| -rwxr-xr-x | utils/test/reporting/docker/web_server.sh | 2 | ||||
| -rw-r--r-- | utils/test/reporting/reporting/functest/template/index-status-tmpl.html | 29 | ||||
| -rw-r--r-- | utils/test/reporting/setup.py | 1 |
19 files changed, 141 insertions, 78 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index ed02714fd..4244f4427 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -56,7 +56,9 @@ else BASE=$CONFIG IMAGES=$RESOURCES LIB="/var/opt/opnfv/lib" - + sudo mkdir -p /var/log/apex + sudo chmod 777 /var/log/apex + cd /var/log/apex fi # Install Dependencies diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index f0e0535ea..51f59f7b1 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -180,7 +180,7 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: ANT - pattern: 'tests/**' + pattern: 'apex/tests/**' properties: - logrotate-default - throttle: @@ -243,6 +243,8 @@ pattern: 'lib/**' - compare-type: ANT pattern: 'config/**' + - compare-type: ANT + pattern: 'apex/**' properties: - logrotate-default diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 5a44dbc00..99076fbc6 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -92,7 +92,7 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: ANT - pattern: 'tests/**' + pattern: 'apex/tests/**' properties: - logrotate-default - throttle: @@ -155,6 +155,8 @@ pattern: 'lib/**' - compare-type: ANT pattern: 'config/**' + - compare-type: ANT + pattern: 'apex/**' properties: - logrotate-default diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index cdc14e4e0..f1bff072c 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -52,16 +52,16 @@ slave-label: arm-pod2 installer: fuel <<: *euphrates - - arm-pod3: - slave-label: arm-pod3 + - arm-pod5: + slave-label: arm-pod5 installer: fuel <<: *euphrates - arm-pod4: slave-label: arm-pod4 installer: fuel <<: *euphrates - - arm-virtual1: - slave-label: arm-virtual1 + - arm-virtual2: + slave-label: arm-virtual2 installer: fuel <<: *euphrates #-------------------------------- @@ -71,16 +71,16 @@ slave-label: arm-pod2 installer: fuel <<: *master - - arm-pod3: - slave-label: arm-pod3 + - arm-pod5: + slave-label: arm-pod5 installer: fuel <<: *master - arm-pod4: slave-label: arm-pod4 installer: fuel <<: *master - - arm-virtual1: - slave-label: arm-virtual1 + - arm-virtual2: + slave-label: arm-virtual2 installer: fuel <<: *master #-------------------------------- @@ -412,31 +412,31 @@ # Enea Armband Non CI Virtual Triggers running against euphrates branch #-------------------------------------------------------------------- - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual1-euphrates-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual2-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-ha-arm-virtual1-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-ha-arm-virtual2-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual1-euphrates-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual2-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual1-euphrates-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual2-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual1-euphrates-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual2-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-arm-virtual1-euphrates-trigger' + name: 'fuel-os-odl_l2-sfc-ha-arm-virtual2-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-arm-virtual1-euphrates-trigger' + name: 'fuel-os-odl_l2-sfc-noha-arm-virtual2-euphrates-trigger' triggers: - timed: '' @@ -444,31 +444,31 @@ # Enea Armband Non CI Virtual Triggers running against master branch #-------------------------------------------------------------------- - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual1-master-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual2-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-ha-arm-virtual1-master-trigger' + name: 'fuel-os-nosdn-nofeature-ha-arm-virtual2-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual1-master-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual2-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual1-master-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual2-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual1-master-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual2-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-arm-virtual1-master-trigger' + name: 'fuel-os-odl_l2-sfc-ha-arm-virtual2-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-arm-virtual1-master-trigger' + name: 'fuel-os-odl_l2-sfc-noha-arm-virtual2-master-trigger' triggers: - timed: '' @@ -538,62 +538,62 @@ # Enea Armband POD 3 Triggers running against master branch #---------------------------------------------------------- - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-master-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-arm-pod5-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-master-trigger' + name: 'fuel-os-nosdn-nofeature-ha-arm-pod5-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-master-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-arm-pod5-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-master-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod5-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-master-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-arm-pod5-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-master-trigger' + name: 'fuel-os-odl_l2-sfc-ha-arm-pod5-master-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-master-trigger' + name: 'fuel-os-odl_l2-sfc-noha-arm-pod5-master-trigger' triggers: - timed: '' #--------------------------------------------------------------- # Enea Armband POD 3 Triggers running against euphrates branch #--------------------------------------------------------------- - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-euphrates-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-arm-pod5-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-ha-arm-pod5-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-euphrates-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-arm-pod5-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-euphrates-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod5-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-euphrates-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-arm-pod5-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-euphrates-trigger' + name: 'fuel-os-odl_l2-sfc-ha-arm-pod5-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-euphrates-trigger' + name: 'fuel-os-odl_l2-sfc-noha-arm-pod5-euphrates-trigger' triggers: - timed: '' #-------------------------------------------------------------------------- diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index 341aab590..a7570431d 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -16,6 +16,10 @@ RELENG_REPO=${WORKSPACE}/releng [ -d ${RELENG_REPO} ] && rm -rf ${RELENG_REPO} git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO} >${redirect} +YARDSTICK_REPO=${WORKSPACE}/yardstick +[ -d ${YARDSTICK_REPO} ] && rm -rf ${YARDSTICK_REPO} +git clone https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO} >${redirect} + OPENRC=/tmp/admin_rc.sh OS_CACERT=/tmp/os_cacert @@ -85,11 +89,18 @@ if [[ $SUITE_NAME == *posca* ]]; then echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently." fi - cmd="sudo python ${RELENG_REPO}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ + if [[ ${INSTALLER_TYPE} != compass ]]; then + cmd="sudo python ${RELENG_REPO}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ -i ${INSTALLER_IP} ${options} -f ${BOTTLENECKS_CONFIG}/pod.yaml \ -s ${BOTTLENECKS_CONFIG}/id_rsa" - echo ${cmd} - ${cmd} + echo ${cmd} + ${cmd} + else + cmd="sudo cp ${YARDSTICK_REPO}/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml \ + ${BOTTLENECKS_CONFIG}" + echo ${cmd} + ${cmd} + fi deactivate diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml index 67d1e4eee..101db8241 100644 --- a/jjb/compass4nfv/compass-dovetail-jobs.yml +++ b/jjb/compass4nfv/compass-dovetail-jobs.yml @@ -19,7 +19,7 @@ #------------------------------------ pod: - baremetal: - slave-label: compass-baremetal + slave-label: compass-baremetal-branch os-version: 'xenial' <<: *danube #----------------------------------- diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 23d12def4..d535d6109 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -39,7 +39,7 @@ pod: - arm-pod2: slave-label: '{pod}' - - arm-pod3: + - arm-pod5: slave-label: '{pod}' jobs: diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 42e1ad585..92b1db356 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -142,12 +142,12 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - arm-pod3: + - arm-pod5: slave-label: '{pod}' SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - arm-virtual1: + - arm-virtual2: slave-label: '{pod}' SUT: fuel auto-trigger-name: 'daily-trigger-disabled' diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 346a1ef08..7dd6a2ddc 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -122,13 +122,26 @@ if [ "$INSTALLER_TYPE" == "apex" ]; then sudo scp $ssh_options stack@${INSTALLER_IP}:~/.ssh/id_rsa ${DOVETAIL_CONFIG}/id_rsa fi +image_path=${HOME}/opnfv/dovetail/images +if [[ ! -d ${image_path} ]]; then + mkdir -p ${image_path} +fi # sdnvpn test case needs to download this image first before running -echo "Download image ubuntu-16.04-server-cloudimg-amd64-disk1.img ..." -wget -q -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${DOVETAIL_CONFIG} +ubuntu_image=${image_path}/ubuntu-16.04-server-cloudimg-amd64-disk1.img +if [[ ! -f ${ubuntu_image} ]]; then + echo "Download image ubuntu-16.04-server-cloudimg-amd64-disk1.img ..." + wget -q -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${image_path} +fi +sudo cp ${ubuntu_image} ${DOVETAIL_CONFIG} # functest needs to download this image first before running -echo "Download image cirros-0.3.5-x86_64-disk.img ..." -wget -q -nc http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P ${DOVETAIL_CONFIG} +cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img +if [[ ! -f ${cirros_image} ]]; then + echo "Download image cirros-0.3.5-x86_64-disk.img ..." + wget -q -nc http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P ${image_path} +fi +sudo cp ${cirros_image} ${DOVETAIL_CONFIG} + opts="--privileged=true -id" diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index da098862a..f0e08e171 100644 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -66,6 +66,7 @@ fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file_vol}" +set +e tiers=(healthcheck smoke features vnf) for tier in ${tiers[@]}; do diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index f14ca758f..23649fc08 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -154,7 +154,7 @@ slave-label: '{pod}' installer: fuel <<: *master - - arm-pod3: + - arm-pod5: slave-label: '{pod}' installer: fuel <<: *master @@ -162,7 +162,7 @@ slave-label: '{pod}' installer: fuel <<: *master - - arm-virtual1: + - arm-virtual2: slave-label: '{pod}' installer: fuel <<: *master @@ -190,7 +190,7 @@ slave-label: '{pod}' installer: fuel <<: *danube - - arm-pod3: + - arm-pod5: slave-label: '{pod}' installer: fuel <<: *danube @@ -198,7 +198,7 @@ slave-label: '{pod}' installer: fuel <<: *danube - - arm-virtual1: + - arm-virtual2: slave-label: '{pod}' installer: fuel <<: *danube @@ -418,6 +418,7 @@ - ./functest-env-presetup.sh - ../../utils/fetch_os_creds.sh - ./functest-alpine.sh + - ../../utils/push-test-logs.sh - builder: name: functest-daily diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 7d9e737e7..e54c3bf13 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -33,7 +33,7 @@ if [ "$BRANCH" != 'stable/danube' ]; then echo "Functest: Download images that will be used by test cases" images_dir="${HOME}/opnfv/functest/images" chmod +x ${WORKSPACE}/functest/ci/download_images.sh - ${WORKSPACE}/functest/ci/download_images.sh ${images_dir} + ${WORKSPACE}/functest/ci/download_images.sh ${images_dir} > ${redirect} 2>&1 images_vol="-v ${images_dir}:/home/opnfv/functest/images" echo "Functest: Images successfully downloaded" fi diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index f5de021a6..9234206a5 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -817,15 +817,15 @@ default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: - name: 'arm-pod3-defaults' + name: 'arm-pod5-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - arm-pod3 + - arm-pod5 default-slaves: - - arm-pod3 + - arm-pod5 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -853,15 +853,15 @@ default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: - name: 'arm-virtual1-defaults' + name: 'arm-virtual2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - arm-virtual1 + - arm-virtual2 default-slaves: - - arm-virtual1 + - arm-virtual2 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml index 007384b7a..39935abc2 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yml +++ b/jjb/yardstick/yardstick-daily-jobs.yml @@ -176,22 +176,22 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *danube - - arm-pod3: + - arm-pod5: slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - arm-pod3: + - arm-pod5: slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *danube - - arm-virtual1: + - arm-virtual2: slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - arm-virtual1: + - arm-virtual2: slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' @@ -381,7 +381,7 @@ default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-arm-virtual1' + name: 'yardstick-params-arm-virtual2' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -464,7 +464,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-arm-pod3' + name: 'yardstick-params-arm-pod5' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -515,4 +515,4 @@ - trigger: name: 'yardstick-daily-huawei-pod4-trigger' triggers: - - timed: '0 1 * * *' + - timed: ''
\ No newline at end of file diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 79190ec2f..518d20ae5 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -27,7 +27,7 @@ node_list=(\ 'ericsson-pod1' 'ericsson-pod2' \ 'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ 'ericsson-virtual4' 'ericsson-virtual5' 'ericsson-virtual12' \ -'arm-pod1' 'arm-pod3' \ +'arm-pod1' 'arm-pod5' \ 'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' 'huawei-pod5' \ 'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \ 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \ diff --git a/utils/test/reporting/docker/Dockerfile b/utils/test/reporting/docker/Dockerfile index f5168d1ae..f2357909d 100644 --- a/utils/test/reporting/docker/Dockerfile +++ b/utils/test/reporting/docker/Dockerfile @@ -27,19 +27,28 @@ ENV CONFIG_REPORTING_YAML ${working_dir}/reporting.yaml WORKDIR ${HOME} # Packaged dependencies RUN apt-get update && apt-get install -y \ +build-essential \ ssh \ +curl \ +gnupg \ python-pip \ +python-dev \ +python-setuptools \ git-core \ -nodejs \ -npm \ supervisor \ --no-install-recommends -RUN pip install --upgrade pip +RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0 -RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${HOME}/releng +RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng /home/opnfv/releng RUN pip install -r ${working_dir}/requirements.txt +RUN sh -c 'curl -sL https://deb.nodesource.com/setup_8.x | bash -' \ + && apt-get install -y nodejs \ + && npm install -g bower \ + && npm install -g grunt \ + && npm install -g grunt-cli + WORKDIR ${working_dir} RUN python setup.py install RUN docker/reporting.sh diff --git a/utils/test/reporting/docker/web_server.sh b/utils/test/reporting/docker/web_server.sh index a34c11dd7..0dd8df73d 100755 --- a/utils/test/reporting/docker/web_server.sh +++ b/utils/test/reporting/docker/web_server.sh @@ -9,8 +9,6 @@ echo "daemon off;" >> /etc/nginx/nginx.conf # supervisor config cp /home/opnfv/releng/utils/test/reporting/docker/supervisor.conf /etc/supervisor/conf.d/ -ln -s /usr/bin/nodejs /usr/bin/node - # Manage Angular front end cd pages && /bin/bash angular.sh diff --git a/utils/test/reporting/reporting/functest/template/index-status-tmpl.html b/utils/test/reporting/reporting/functest/template/index-status-tmpl.html index 74d410e96..50fc648aa 100644 --- a/utils/test/reporting/reporting/functest/template/index-status-tmpl.html +++ b/utils/test/reporting/reporting/functest/template/index-status-tmpl.html @@ -90,7 +90,7 @@ $(document).ready(function (){ <div class="panel-heading"><h4><b>List of last scenarios ({{version}}) run over the last {{period}} days </b></h4></div> <table class="table"> <tr> - <th width="40%">Scenario</th> + <th width="40%">HA Scenario</th> <th width="20%">Status</th> <th width="20%">Trend</th> <th width="10%">Score</th> @@ -98,14 +98,39 @@ $(document).ready(function (){ </tr> {% for scenario,iteration in scenario_stats.iteritems() -%} <tr class="tr-ok"> + {% if '-ha' in scenario -%} <td><a href={{scenario_results[scenario].getUrlLastRun()}}>{{scenario}}</a></td> <td><div id="gaugeScenario{{loop.index}}"></div></td> <td><div id="trend_svg{{loop.index}}"></div></td> <td>{{scenario_results[scenario].getScore()}}</td> <td>{{iteration}}</td> + {%- endif %} + </tr> + {%- endfor %} + <br> + </table> + <br> + <table class="table"> + <tr> + <th width="40%">NOHA Scenario</th> + <th width="20%">Status</th> + <th width="20%">Trend</th> + <th width="10%">Score</th> + <th width="10%">Iteration</th> + </tr> + {% for scenario,iteration in scenario_stats.iteritems() -%} + <tr class="tr-ok"> + {% if '-noha' in scenario -%} + <td><a href={{scenario_results[scenario].getUrlLastRun()}}>{{scenario}}</a></td> + <td><div id="gaugeScenario{{loop.index}}"></div></td> + <td><div id="trend_svg{{loop.index}}"></div></td> + <td>{{scenario_results[scenario].getScore()}}</td> + <td>{{iteration}}</td> + {%- endif %} </tr> {%- endfor %} - </table> + </table> + </div> diff --git a/utils/test/reporting/setup.py b/utils/test/reporting/setup.py index a52d90555..17849f67b 100644 --- a/utils/test/reporting/setup.py +++ b/utils/test/reporting/setup.py @@ -8,7 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # pylint: disable=missing-docstring - import setuptools # In python < 2.7.4, a lazy loading of package `pbr` will break |