Merge "Allow creation of Dockerfile.aarch64 through patch"
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>
Wed, 15 Mar 2017 09:30:26 +0000 (09:30 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 15 Mar 2017 09:30:26 +0000 (09:30 +0000)
43 files changed:
jjb/apex/apex.yml
jjb/armband/armband-ci-jobs.yml
jjb/armband/armband-project-jobs.yml
jjb/barometer/barometer.yml
jjb/compass4nfv/compass-ci-jobs.yml
jjb/compass4nfv/compass-project-jobs.yml
jjb/compass4nfv/compass-verify-jobs.yml
jjb/cperf/cperf-ci-jobs.yml
jjb/daisy4nfv/daisy-project-jobs.yml
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
jjb/fuel/fuel-daily-jobs.yml
jjb/fuel/fuel-project-jobs.yml
jjb/fuel/fuel-verify-jobs.yml
jjb/fuel/fuel-weekly-jobs.yml
jjb/functest/functest-daily-jobs.yml
jjb/global/slave-params.yml
jjb/joid/joid-daily-jobs.yml
jjb/multisite/multisite-verify-jobs.yml
jjb/onosfw/onosfw.yml
jjb/opnfvdocs/opnfvdocs.yml
jjb/ovsnfv/ovsnfv.yml
jjb/qtip/helpers/validate-deploy.sh
jjb/qtip/qtip-validate-jobs.yml
jjb/qtip/qtip-verify-jobs.yml
jjb/releng/opnfv-docker-arm.yml
jjb/releng/opnfv-docker.sh
jjb/releng/opnfv-docker.yml
jjb/snaps/snaps.yml
jjb/storperf/storperf.yml
jjb/vswitchperf/vswitchperf.yml
prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml
prototypes/bifrost/scripts/test-bifrost-deployment.sh
prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
utils/test/reporting/functest/reporting-status.py
utils/test/reporting/html/danube.html
utils/test/reporting/html/functest-danube.html [new file with mode: 0644]
utils/test/reporting/html/functest-master.html
utils/test/reporting/html/index.html
utils/test/reporting/html/master.html [new file with mode: 0644]
utils/test/reporting/img/euphrates.jpg [new file with mode: 0644]
utils/test/reporting/reporting.yaml
utils/test/reporting/utils/reporting_utils.py

index ac1ef49..3e78f32 100644 (file)
@@ -10,9 +10,6 @@
         - 'apex-deploy-virtual-{scenario}-{stream}'
         - 'apex-deploy-baremetal-{scenario}-{stream}'
         - 'apex-daily-{stream}'
-        - 'apex-daily-colorado'
-        - 'apex-build-colorado'
-        - 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
 
             slave: 'lf-pod1'
             verify-slave: 'apex-verify-master'
             daily-slave: 'apex-daily-master'
+        - danube:
+            branch: 'stable/danube'
+            gs-pathname: '/danube'
+            slave: 'lf-pod1'
+            verify-slave: 'apex-verify-danube'
+            daily-slave: 'apex-daily-danube'
 
     project: 'apex'
 
@@ -35,6 +38,8 @@
          - 'os-nosdn-ovs-noha'
          - 'os-nosdn-fdio-noha'
          - 'os-nosdn-fdio-ha'
+         - 'os-nosdn-kvm-ha'
+         - 'os-nosdn-kvm-noha'
          - 'os-odl_l2-fdio-noha'
          - 'os-odl_l2-fdio-ha'
          - 'os-odl_l2-netvirt_gbp_fdio-noha'
 
     builders:
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
+          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-noha-{stream}'
             predefined-parameters:
               OPNFV_CLEAN=yes
             git-revision: false
         - trigger-builds:
           - project: 'cperf-apex-intel-pod2-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
             block: true
             same-node: true
 
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
-
-# Colorado Build
-- job-template:
-    name: 'apex-build-colorado'
-
-    # Job template for builds
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    node: 'apex-daily-colorado'
-
-    disabled: false
-
-    concurrent: true
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: 'stable/colorado'
-        - apex-parameter:
-            gs-pathname: '/colorado'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from parameters macro."
-
-    scm:
-        - git-scm
-
-    properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-deploy.*'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
-
-    builders:
-        - 'apex-build'
-        - 'apex-upload-artifact'
-
-
-# Colorado FDIO Deploy
-- job-template:
-    name: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
-
-    # Job template for baremetal deployment
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    node: 'lf-pod1'
-
-    disabled: false
-
-    scm:
-        - git-scm
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: 'stable/colorado'
-        - apex-parameter:
-            gs-pathname: '/colorado'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-fdio-ha'
-            description: "Scenario to deploy with."
-
-    properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-                - 'apex-deploy.*'
-                - 'apex-build.*'
-
-
-    builders:
-        - 'apex-deploy'
-        - 'apex-workspace-cleanup'
-
-# Colorado FDIO Daily
-- job-template:
-    name: 'apex-daily-colorado'
-
-    # Job template for daily build
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    node: 'apex-daily-colorado'
-
-    disabled: false
-
-    scm:
-        - git-scm
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: 'stable/colorado'
-        - apex-parameter:
-            gs-pathname: '/colorado'
-
-    properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-                - 'apex-deploy.*'
-                - 'apex-build.*'
-                - 'apex-runner.*'
-
-    triggers:
-        - 'apex-colorado'
-
-    builders:
         - trigger-builds:
-          - project: 'apex-build-colorado'
+          - project: 'apex-deploy-baremetal-os-nosdn-kvm-ha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
             git-revision: true
-            current-parameters: true
             same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
             block: true
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-kvm-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-kvm-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l3-fdio-noha-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-colorado/.build
+              BUILD_DIRECTORY=apex-build-{stream}/.build
               OPNFV_CLEAN=yes
             git-revision: true
             same-node: true
                 build-step-failure-threshold: 'never'
             block: true
         - trigger-builds:
-          - project: 'functest-apex-apex-daily-colorado-daily-colorado'
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
+              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
             block: true
             same-node: true
             block-thresholds:
 - trigger:
     name: 'apex-master'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 3 * * 7'
 - trigger:
-    name: 'apex-colorado'
+    name: 'apex-danube'
     triggers:
         - timed: '0 12 * * *'
 - trigger:
index 4cb58d9..6678717 100644 (file)
@@ -15,7 +15,7 @@
         stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
-        disabled: true
+        disabled: false
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
index fd37c5a..f6840a0 100644 (file)
@@ -20,7 +20,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'armband-{installer}-build-daily-{stream}'
index 6a17e17..8c0f6ce 100644 (file)
@@ -20,7 +20,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'barometer-verify-{stream}'
index 5ccd4b5..c934d19 100644 (file)
@@ -15,7 +15,7 @@
         stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
-        disabled: true
+        disabled: false
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
index ed0fee6..9b13e69 100644 (file)
@@ -16,7 +16,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     jobs:
         - 'compass-build-iso-{stream}'
index 039b30a..7c9f87a 100644 (file)
@@ -37,6 +37,7 @@
 #####################################
     jobs:
         - 'compass-verify-{distro}-{stream}'
+        - 'compass-verify-k8-{distro}-{stream}'
         - 'compass-verify-{phase}-{distro}-{stream}'
 #####################################
 # job templates
                   kill-phase-on: NEVER
                   abort-all-job: true
 
+- job-template:
+    name: 'compass-verify-k8-{distro}-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+        - logrotate-default
+        - throttle:
+            enabled: true
+            max-total: 4
+            max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-verify-[^-]*-[^-]*'
+                - 'compass-os-.*?-virtual-daily-.*?'
+            block-level: 'NODE'
+
+    scm:
+        - git-scm-gerrit
+
+    wrappers:
+        - ssh-agent-wrapper
+        - timeout:
+            timeout: 120
+            fail: true
+
+    triggers:
+        - gerrit:
+            server-name: 'gerrit.opnfv.org'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'check k8'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify k8'
+                - comment-added-contains-event:
+                    comment-contains-value: 'check kubernetes'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify kubernetes'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: '**/*'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
+            readable-message: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - 'compass-virtual-defaults'
+        - '{installer}-defaults'
+        - 'compass-verify-defaults':
+            installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'k8-nosdn-nofeature-ha'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - multijob:
+            name: basic
+            condition: SUCCESSFUL
+            projects:
+                - name: 'opnfv-lint-verify-{stream}'
+                  current-parameters: true
+                  node-parameters: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+                - name: 'opnfv-yamllint-verify-{stream}'
+                  current-parameters: true
+                  node-parameters: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+        - multijob:
+            name: deploy-virtual
+            condition: SUCCESSFUL
+            projects:
+                - name: 'compass-verify-deploy-virtual-{distro}-{stream}'
+                  current-parameters: true
+                  predefined-parameters: |
+                    COMPASS_OS_VERSION={os-version}
+                  node-parameters: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+
 - job-template:
     name: 'compass-verify-{phase}-{distro}-{stream}'
 
index 125937e..d1914f6 100644 (file)
     builders:
         - shell: |
             #!/bin/bash
-            set +e
-            # TODO: need to figure out the logic to get ${CONTROLLER_IP} used below
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+            undercloud_mac=$(sudo virsh domiflist undercloud | grep default | \
+                              grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+            INSTALLER_IP=$(/usr/sbin/arp -e | grep ${undercloud_mac} | awk {'print $1'})
+            sudo scp $INSTALLER_IP:/home/stack/stackrc /tmp/stackrc
+            source /tmp/stackrc
+
+            # robot suites need the ssh key to log in to controller nodes, so throwing it
+            # in tmp, and mounting /tmp as $HOME as far as robot is concerned
+            sudo mkdir -p /tmp/.ssh
+            sudo scp $INSTALLER_IP:/home/stack/.ssh/id_rsa /tmp/.ssh/
+            sudo chmod -R 0600 /tmp/.ssh
+
+            # cbench requires the openflow drop test feature to be installed.
+            sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+                                 -o UserKnownHostsFile=/dev/null \
+                                 -o LogLevel=error \
+                                 -p 8101 karaf@$SDN_CONTROLLER_IP \
+                                  feature:install odl-openflowplugin-flow-services-ui odl-openflowplugin-drop-test
+
             docker pull opnfv/cperf:$DOCKER_TAG
-            robot_cmd="pybot -e exclude -v ODL_SYSTEM_IP:${CONTROLLER_IP} -v switch_count:100 -v loops:10 \
-                              -v TOOLS_SYSTEM_IP:localhost -v duration_in_seconds:60"
+
+            robot_cmd="pybot -e exclude -L TRACE \
+                        -v ODL_SYSTEM_1_IP:${SDN_CONTROLLER_IP} \
+                        -v ODL_SYSTEM_IP:${SDN_CONTROLLER_IP} \
+                        -v BUNDLEFOLDER:/opt/opendaylight \
+                        -v RESTCONFPORT:8081 \
+                        -v USER_HOME:/tmp \
+                        -v USER:heat-admin \
+                        -v ODL_SYSTEM_USER:heat-admin \
+                        -v TOOLS_SYSTEM_IP:localhost \
+                        -v of_port:6653"
             robot_suite="/home/opnfv/repos/odl_test/csit/suites/openflowplugin/Performance/010_Cbench.robot"
-            docker run opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite}
+
+            docker run -v /tmp:/tmp opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite}
 
 - builder:
     name: cperf-cleanup
index 0127ed0..9a57e17 100644 (file)
@@ -23,7 +23,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     phase:
         - 'build':
index 95d851c..a448933 100644 (file)
@@ -21,7 +21,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 #####################################
 # patch merge phases
 #####################################
index ee82c14..18093f0 100644 (file)
@@ -21,7 +21,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 #####################################
 # patch verification phases
 #####################################
index 19336d8..36f3ce4 100644 (file)
@@ -18,7 +18,7 @@
     danube: &danube
         stream: danube
         branch: 'stable/{stream}'
-        disabled: true
+        disabled: false
         gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
index 32ad890..80b9deb 100644 (file)
@@ -16,7 +16,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     jobs:
         - 'fuel-build-daily-{stream}'
index 7f9eff0..a4bd6aa 100644 (file)
@@ -15,7 +15,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 #####################################
 # patch verification phases
 #####################################
index 06d8134..bd42ed8 100644 (file)
@@ -18,7 +18,7 @@
     danube: &danube
         stream: danube
         branch: 'stable/{stream}'
-        disabled: true
+        disabled: false
         gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
index 5984b36..972c4fd 100644 (file)
             slave-label: '{pod}'
             installer: apex
             <<: *master
-#        - apex-verify-danube:
-#            slave-label: '{pod}'
-#            installer: apex
-#            <<: *danube
-#        - apex-daily-danube:
-#            slave-label: '{pod}'
-#            installer: apex
-#            <<: *danube
+        - apex-verify-danube:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *danube
+        - apex-daily-danube:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *danube
 # armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
index 4b3eaaa..6aa2e71 100644 (file)
             default-slaves:
                 - lf-pod1
 - parameter:
-    name: 'apex-daily-colorado-defaults'
+    name: 'apex-daily-danube-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-daily-colorado'
+            default: 'apex-daily-danube'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
                 - intel-virtual4
                 - intel-virtual5
 - parameter:
-    name: 'apex-verify-colorado-defaults'
+    name: 'apex-verify-danube-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-verify-colorado'
+            default: 'apex-verify-danube'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
index e615244..97e290c 100644 (file)
@@ -20,7 +20,7 @@
     danube: &danube
         stream: danube
         branch: 'stable/{stream}'
-        disabled: true
+        disabled: false
         gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        # 1.dovetail only master by now, not sync with A/B/C branches
+        # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
+        # 3.only debug testsuite here(includes basic testcase,
+        #   i.e. one tempest smoke ipv6, two vping from functest)
+        # 4.not used for release criteria or compliance,
+        #   only to debug the dovetail tool bugs with joid
+        - trigger-builds:
+            - project: 'dovetail-joid-{pod}-debug-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'joid-deploy-{pod}-daily-{stream}'
index 5ecfafb..e56b62b 100644 (file)
@@ -19,7 +19,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
             timed: ''
 
 - job-template:
index 13c9671..3afcb65 100644 (file)
@@ -16,7 +16,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     project: 'onosfw'
 
index 661f060..0553cd4 100644 (file)
@@ -20,7 +20,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 ########################
 # job templates
index 937a367..0e8c713 100644 (file)
@@ -16,7 +16,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
index 1645537..90b54a1 100644 (file)
@@ -8,15 +8,14 @@
 ##############################################################################
 set -e
 
-envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
-suite="TEST_CASE=all"
+envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
+-e NODE_NAME=${NODE_NAME} -e CI_DEBUG=${CI_DEBUG}"
 dir_imgstore="${HOME}/imgstore"
-img_volume="${dir_imgstore}:/home/opnfv/imgstore"
 
 echo "Qtip: Pulling docker image: opnfv/qtip:${DOCKER_TAG}"
 docker pull opnfv/qtip:$DOCKER_TAG
 
-cmd=" docker run -id -e $envs -e $suite -v ${img_volume} opnfv/qtip:${DOCKER_TAG} /bin/bash"
+cmd=" docker run -id -e $envs opnfv/qtip:${DOCKER_TAG} /bin/bash"
 echo "Qtip: Running docker command: ${cmd}"
 ${cmd}
 
@@ -27,7 +26,10 @@ if [ $(docker ps | grep 'opnfv/qtip' | wc -l) == 0 ]; then
 else
     echo "The container ID is: ${container_id}"
     QTIP_REPO=/home/opnfv/repos/qtip
-# TODO(yujunz): execute benchmark plan for compute-qpi
+# TODO(zhihui_wu): use qtip cli to execute benchmark test in the future
+    docker exec -t ${container_id} bash -c "cd ${QTIP_REPO}/qtip/runner/ &&
+    python runner.py -d /home/opnfv/qtip/results/ -b all"
+
 fi
 
 echo "Qtip done!"
index 10ee72a..4cd8490 100644 (file)
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: latest
+    danube: &danube
+        stream: danube
+        branch: 'stable/{stream}'
+        gs-pathname: '/{stream}'
+        docker-tag: 'stable'
 
 #--------------------------------
 # JOB VARIABLES
@@ -24,6 +29,9 @@
         - zte-pod3:
             installer: fuel
             <<: *master
+        - zte-pod3:
+            installer: fuel
+            <<: *danube
     task:
         - daily:
             auto-builder-name: qtip-validate-deploy
             <<: *master
         - '{installer}-defaults'
         - '{pod}-defaults'
+        - string:
+            name: CI_DEBUG
+            default: 'false'
+            description: "Show debug output information"
     scm:
         - git-scm
     triggers:
index 5f0292b..806d7fd 100644 (file)
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+        - danube:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
 
 ################################
 ## job templates
index 09c9f33..ba540ed 100644 (file)
@@ -13,7 +13,7 @@
     danube: &danube
         stream: danube
         branch: 'stable/{stream}'
-        disabled: true
+        disabled: false
     functest-arm-receivers: &functest-arm-receivers
         receivers: >
             cristina.pauna@enea.com
index 7066d37..9bd711b 100644 (file)
@@ -74,7 +74,7 @@ echo "Current branch: $BRANCH"
 if [[ "$BRANCH" == "master" ]]; then
     DOCKER_TAG="latest"
 else
-    if [[ "$RELEASE_VERSION" != "" ]]; then
+    if [[ -n "${RELEASE_VERSION-}" ]]; then
         release=${BRANCH##*/}
         DOCKER_TAG=${release}.${RELEASE_VERSION}
         # e.g. colorado.1.0, colorado.2.0, colorado.3.0
index 90a91f8..f699921 100644 (file)
@@ -13,7 +13,7 @@
     danube: &danube
         stream: danube
         branch: 'stable/{stream}'
-        disabled: true
+        disabled: false
     functest-receivers: &functest-receivers
         receivers: >
             jose.lausuch@ericsson.com morgan.richomme@orange.com
index 32680f5..ea8dfb0 100644 (file)
@@ -18,7 +18,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'snaps-verify-{stream}'
index a04a9f4..709a1eb 100644 (file)
@@ -16,7 +16,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'storperf-verify-{stream}'
index ef0e90a..715305b 100644 (file)
@@ -18,8 +18,8 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
-            slave-label: 'intel-pod12'
+            disabled: false
+            slave-label: 'opnfv-build-ubuntu'
 
 - job-template:
 
index 541a1f7..07d5e24 100644 (file)
@@ -54,7 +54,7 @@
       dib_os_element: "{{ lookup('env','DIB_OS_ELEMENT') }}"
       dib_os_release: "{{ lookup('env', 'DIB_OS_RELEASE') }}"
       extra_dib_elements: "{{ lookup('env', 'EXTRA_DIB_ELEMENTS') | default('') }}"
-      dib_elements: "vm serial-console simple-init devuser infra-cloud-bridge puppet growroot {{ extra_dib_elements }}"
+      dib_elements: "vm enable-serial-console simple-init devuser infra-cloud-bridge puppet growroot {{ extra_dib_elements }}"
       dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}"
       when: create_image_via_dib | bool == true and transform_boot_image | bool == false
   environment:
index 3e2381f..b7165ff 100755 (executable)
@@ -18,6 +18,7 @@ ENABLE_VENV="false"
 USE_DHCP="false"
 USE_VENV="false"
 BUILD_IMAGE=true
+BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.json'}
 PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600}
 
 # Set defaults for ansible command-line options to drive the different
@@ -50,10 +51,10 @@ INVENTORY_DHCP_STATIC_IP=false
 WRITE_INTERFACES_FILE=true
 
 # Set BIFROST_INVENTORY_SOURCE
-export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.csv
+export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.json
 
 # DIB custom elements path
-export ELEMENTS_PATH=/usr/share/diskimage-builder/elements:/opt/puppet-infracloud/files/elements
+export ELEMENTS_PATH=/opt/puppet-infracloud/files/elements
 
 # settings for console access
 export DIB_DEV_USER_PWDLESS_SUDO=yes
@@ -107,7 +108,8 @@ ${ANSIBLE} -vvvv \
        -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \
        -e test_vm_memory_size=${VM_MEMORY_SIZE} \
        -e enable_venv=${ENABLE_VENV} \
-       -e test_vm_domain_type=${VM_DOMAIN_TYPE}
+       -e test_vm_domain_type=${VM_DOMAIN_TYPE} \
+       -e baremetal_json_file=${BAREMETAL_DATA_FILE}
 
 # Execute the installation and VM startup test.
 ${ANSIBLE} -vvvv \
index fc9bf71..d167973 100644 (file)
@@ -239,13 +239,6 @@ class opnfv::server (
     multiple => true,
   }
 
-  # disable selinux in case of RHEL
-  if ($::osfamily == 'RedHat') {
-    class { 'selinux':
-      mode => 'disabled',
-    }
-  }
-
   # update hosts
   create_resources('host', hiera_hash('hosts'))
 }
index 95f9e66..af1d1d8 100755 (executable)
@@ -98,8 +98,14 @@ for version in versions:
         scenario_stats = rp_utils.getScenarioStats(scenario_results)
         items = {}
         scenario_result_criteria = {}
-        scenario_file_name = ("./display/" + version +
-                              "/functest/scenario_history.txt")
+        scenario_directory = "./display/" + version + "/functest/"
+        scenario_file_name = scenario_directory + "scenario_history.txt"
+
+        # check that the directory exists, if not create it
+        # (first run on new version)
+        if not os.path.exists(scenario_directory):
+            os.makedirs(scenario_directory)
+
         # initiate scenario file if it does not exist
         if not os.path.isfile(scenario_file_name):
             with open(scenario_file_name, "a") as my_file:
@@ -122,7 +128,9 @@ for version in versions:
             if len(s_result) > 0:
                 build_tag = s_result[len(s_result)-1]['build_tag']
                 logger.debug("Build tag: %s" % build_tag)
-                s_url = s_url = rp_utils.getJenkinsUrl(build_tag)
+                s_url = rp_utils.getJenkinsUrl(build_tag)
+                if s_url is None:
+                    s_url = "http://testresultS.opnfv.org/reporting"
                 logger.info("last jenkins url: %s" % s_url)
             testCases2BeDisplayed = []
             # Check if test case is runnable / installer, scenario
index d21875b..d63e19d 100644 (file)
-<!DOCTYPE HTML>\r
-<!--\r
-       Phantom by HTML5 UP\r
-       html5up.net | @ajlkn\r
-       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)\r
--->\r
-<html>\r
-       <head>\r
-               <title>Phantom by HTML5 UP</title>\r
-               <meta charset="utf-8" />\r
-               <meta name="viewport" content="width=device-width, initial-scale=1" />\r
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->\r
-               <link rel="stylesheet" href="3rd_party/css/main.css" />\r
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->\r
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->\r
-       </head>\r
-       <body>\r
-               <!-- Wrapper -->\r
-                       <div id="wrapper">\r
-\r
-                               <!-- Header -->\r
-                                       <header id="header">\r
-                                               <div class="inner">\r
-\r
-                                                       <!-- Logo -->\r
-                                                               <a href="index.html" class="logo">\r
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>\r
-                                                               </a>\r
-\r
-                                                       <!-- Nav -->\r
-                                                       <!--    <nav>\r
-                                                                       <ul>\r
-                                                                               <li><a href="#menu">Menu</a></li>\r
-                                                                       </ul>\r
-                                                               </nav>\r
-                             --->\r
-                                               </div>\r
-                                       </header>\r
-\r
-                               <!-- Menu -->\r
-                               <!---   <nav id="menu">\r
-                                               <h2>Menu</h2>\r
-                                               <ul>\r
-                                                       <li><a href="index.html">Home</a></li>\r
-                                                       <li><a href="colorado.html">Colorado</a></li>\r
-                                                       <li><a href="danube.html">Danube</a></li>\r
-                                               </ul>\r
-                                       </nav>\r
-                --->\r
-                               <!-- Main -->\r
-                                       <div id="main">\r
-                                               <div class="inner">\r
-                                                       <header>\r
-                                                               <h1>Danube reporting (Master)</h1>\r
-                                                       </header>\r
-                                                       <section class="tiles">\r
-                                                               <article class="style3">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/functest.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="functest-master.html">\r
-                                                                               <h2>Functest</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Functional testing</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                               <article class="style2">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/yardstick.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="master/yardstick/status-apex.html">\r
-                                                                               <h2>Yardstick</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Qualification and performance testing</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                               <article class="style4">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/storperf.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="master/storperf/status-apex.html">\r
-                                                                               <h2>Storperf</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Storage testing</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                       </section>\r
-                                               </div>\r
-                                       </div>\r
-\r
-                               <!-- Footer -->\r
-                                       <footer id="footer">\r
-                                               <div class="inner">\r
-                                                       <section>\r
-                                                               <h2>OPNFV Testing Working group</h2>\r
-                                                       </section>\r
-                                                       <section>\r
-                                                               <h2>Follow</h2>\r
-                                                               <ul class="icons">\r
-                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>\r
-                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>\r
-                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>\r
-                                                               </ul>\r
-                                                       </section>\r
-                                                       <ul class="copyright">\r
-                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>\r
-                                                       </ul>\r
-                                               </div>\r
-                                       </footer>\r
-\r
-                       </div>\r
-\r
-               <!-- Scripts -->\r
-                       <script src="3rd_party/js/jquery.min.js"></script>\r
-                       <script src="3rd_party/js/skel.min.js"></script>\r
-                       <script src="3rd_party/js/util.js"></script>\r
-                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->\r
-                       <script src="3rd_party/js/main.js"></script>\r
-\r
-       </body>\r
-</html>\r
+<!DOCTYPE HTML>
+<!--
+       Phantom by HTML5 UP
+       html5up.net | @ajlkn
+       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+       <head>
+               <title>Phantom by HTML5 UP</title>
+               <meta charset="utf-8" />
+               <meta name="viewport" content="width=device-width, initial-scale=1" />
+               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
+               <link rel="stylesheet" href="3rd_party/css/main.css" />
+               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
+               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
+       </head>
+       <body>
+               <!-- Wrapper -->
+                       <div id="wrapper">
+
+                               <!-- Header -->
+                                       <header id="header">
+                                               <div class="inner">
+
+                                                       <!-- Logo -->
+                                                               <a href="index.html" class="logo">
+                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
+                                                               </a>
+
+                                                       <!-- Nav -->
+                                                       <!--    <nav>
+                                                                       <ul>
+                                                                               <li><a href="#menu">Menu</a></li>
+                                                                       </ul>
+                                                               </nav>
+                             --->
+                                               </div>
+                                       </header>
+
+                               <!-- Menu -->
+                               <!---   <nav id="menu">
+                                               <h2>Menu</h2>
+                                               <ul>
+                                                       <li><a href="index.html">Home</a></li>
+                                                       <li><a href="colorado.html">Colorado</a></li>
+                                                       <li><a href="danube.html">Danube</a></li>
+                                               </ul>
+                                       </nav>
+                --->
+                               <!-- Main -->
+                                       <div id="main">
+                                               <div class="inner">
+                                                       <header>
+                                                               <h1>Danube reporting</h1>
+                                                       </header>
+                                                       <section class="tiles">
+                                                               <article class="style3">
+                                                                       <span class="image">
+                                                                               <img src="img/functest.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="functest-danube.html">
+                                                                               <h2>Functest</h2>
+                                                                               <div class="content">
+                                                                                       <p>Functional testing</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style2">
+                                                                       <span class="image">
+                                                                               <img src="img/yardstick.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="danube/yardstick/status-apex.html">
+                                                                               <h2>Yardstick</h2>
+                                                                               <div class="content">
+                                                                                       <p>Qualification and performance testing</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style4">
+                                                                       <span class="image">
+                                                                               <img src="img/storperf.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="danube/storperf/status-apex.html">
+                                                                               <h2>Storperf</h2>
+                                                                               <div class="content">
+                                                                                       <p>Storage testing</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                       </section>
+                                               </div>
+                                       </div>
+
+                               <!-- Footer -->
+                                       <footer id="footer">
+                                               <div class="inner">
+                                                       <section>
+                                                               <h2>OPNFV Testing Working group</h2>
+                                                       </section>
+                                                       <section>
+                                                               <h2>Follow</h2>
+                                                               <ul class="icons">
+                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
+                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
+                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
+                                                               </ul>
+                                                       </section>
+                                                       <ul class="copyright">
+                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+                                                       </ul>
+                                               </div>
+                                       </footer>
+
+                       </div>
+
+               <!-- Scripts -->
+                       <script src="3rd_party/js/jquery.min.js"></script>
+                       <script src="3rd_party/js/skel.min.js"></script>
+                       <script src="3rd_party/js/util.js"></script>
+                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
+                       <script src="3rd_party/js/main.js"></script>
+
+       </body>
+</html>
diff --git a/utils/test/reporting/html/functest-danube.html b/utils/test/reporting/html/functest-danube.html
new file mode 100644 (file)
index 0000000..ac99cb0
--- /dev/null
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML>
+<!--
+       Phantom by HTML5 UP
+       html5up.net | @ajlkn
+       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+       <head>
+               <title>Phantom by HTML5 UP</title>
+               <meta charset="utf-8" />
+               <meta name="viewport" content="width=device-width, initial-scale=1" />
+               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
+               <link rel="stylesheet" href="3rd_party/css/main.css" />
+               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
+               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
+       </head>
+       <body>
+               <!-- Wrapper -->
+                       <div id="wrapper">
+
+                               <!-- Header -->
+                                       <header id="header">
+                                               <div class="inner">
+
+                                                       <!-- Logo -->
+                                                               <a href="index.html" class="logo">
+                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
+                                                               </a>
+
+                                                       <!-- Nav -->
+                                                       <!--    <nav>
+                                                                       <ul>
+                                                                               <li><a href="#menu">Menu</a></li>
+                                                                       </ul>
+                                                               </nav>
+                             --->
+                                               </div>
+                                       </header>
+
+                               <!-- Menu -->
+                               <!---   <nav id="menu">
+                                               <h2>Menu</h2>
+                                               <ul>
+                                                       <li><a href="index.html">Home</a></li>
+                                                       <li><a href="colorado.html">Colorado</a></li>
+                                                       <li><a href="danube.html">Danube</a></li>
+                                               </ul>
+                                       </nav>
+                --->
+                               <!-- Main -->
+                                       <div id="main">
+                                               <div class="inner">
+                                                       <header>
+                                                               <h1>Functest reporting</h1>
+                                                       </header>
+                                                       <section class="tiles">
+                                                               <article class="style5">
+                                                                       <span class="image">
+                                                                               <img src="img/pic05.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="danube/functest/status-apex.html">
+                                                                               <h2>Status</h2>
+                                                                               <div class="content">
+                                                                                       <p>Scenario status</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style2">
+                                                                       <span class="image">
+                                                                               <img src="img/pic02.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="danube/functest/vims-apex.html">
+                                                                               <h2>vIMS</h2>
+                                                                               <div class="content">
+                                                                                       <p>Virtual IMS</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style3">
+                                                                       <span class="image">
+                                                                               <img src="img/pic03.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="danube/functest/tempest-apex.html">
+                                                                               <h2>Tempest</h2>
+                                                                               <div class="content">
+                                                                                       <p>Tempest OpenStack suite</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                       </section>
+                                               </div>
+                                       </div>
+
+                               <!-- Footer -->
+                                       <footer id="footer">
+                                               <div class="inner">
+                                                       <section>
+                                                               <h2>OPNFV Testing Working group</h2>
+                                                       </section>
+                                                       <section>
+                                                               <h2>Follow</h2>
+                                                               <ul class="icons">
+                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
+                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
+                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
+                                                               </ul>
+                                                       </section>
+                                                       <ul class="copyright">
+                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+                                                       </ul>
+                                               </div>
+                                       </footer>
+
+                       </div>
+
+               <!-- Scripts -->
+                       <script src="3rd_party/js/jquery.min.js"></script>
+                       <script src="3rd_party/js/skel.min.js"></script>
+                       <script src="3rd_party/js/util.js"></script>
+                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
+                       <script src="3rd_party/js/main.js"></script>
+
+       </body>
+</html>
index 03217a6..4b1f763 100644 (file)
-<!DOCTYPE HTML>\r
-<!--\r
-       Phantom by HTML5 UP\r
-       html5up.net | @ajlkn\r
-       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)\r
--->\r
-<html>\r
-       <head>\r
-               <title>Phantom by HTML5 UP</title>\r
-               <meta charset="utf-8" />\r
-               <meta name="viewport" content="width=device-width, initial-scale=1" />\r
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->\r
-               <link rel="stylesheet" href="3rd_party/css/main.css" />\r
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->\r
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->\r
-       </head>\r
-       <body>\r
-               <!-- Wrapper -->\r
-                       <div id="wrapper">\r
-\r
-                               <!-- Header -->\r
-                                       <header id="header">\r
-                                               <div class="inner">\r
-\r
-                                                       <!-- Logo -->\r
-                                                               <a href="index.html" class="logo">\r
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>\r
-                                                               </a>\r
-\r
-                                                       <!-- Nav -->\r
-                                                       <!--    <nav>\r
-                                                                       <ul>\r
-                                                                               <li><a href="#menu">Menu</a></li>\r
-                                                                       </ul>\r
-                                                               </nav>\r
-                             --->\r
-                                               </div>\r
-                                       </header>\r
-\r
-                               <!-- Menu -->\r
-                               <!---   <nav id="menu">\r
-                                               <h2>Menu</h2>\r
-                                               <ul>\r
-                                                       <li><a href="index.html">Home</a></li>\r
-                                                       <li><a href="colorado.html">Colorado</a></li>\r
-                                                       <li><a href="danube.html">Danube</a></li>\r
-                                               </ul>\r
-                                       </nav>\r
-                --->\r
-                               <!-- Main -->\r
-                                       <div id="main">\r
-                                               <div class="inner">\r
-                                                       <header>\r
-                                                               <h1>Functest reporting</h1>\r
-                                                       </header>\r
-                                                       <section class="tiles">\r
-                                                               <article class="style5">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/pic05.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="master/status-apex.html">\r
-                                                                               <h2>Status</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Scenario status</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                               <article class="style2">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/pic02.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="master/vims-apex.html">\r
-                                                                               <h2>vIMS</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Virtual IMS</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                               <article class="style3">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/pic03.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="master/tempest-apex.html">\r
-                                                                               <h2>Tempest</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Tempest OpenStack suite</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                       </section>\r
-                                               </div>\r
-                                       </div>\r
-\r
-                               <!-- Footer -->\r
-                                       <footer id="footer">\r
-                                               <div class="inner">\r
-                                                       <section>\r
-                                                               <h2>OPNFV Testing Working group</h2>\r
-                                                       </section>\r
-                                                       <section>\r
-                                                               <h2>Follow</h2>\r
-                                                               <ul class="icons">\r
-                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>\r
-                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>\r
-                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>\r
-                                                               </ul>\r
-                                                       </section>\r
-                                                       <ul class="copyright">\r
-                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>\r
-                                                       </ul>\r
-                                               </div>\r
-                                       </footer>\r
-\r
-                       </div>\r
-\r
-               <!-- Scripts -->\r
-                       <script src="3rd_party/js/jquery.min.js"></script>\r
-                       <script src="3rd_party/js/skel.min.js"></script>\r
-                       <script src="3rd_party/js/util.js"></script>\r
-                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->\r
-                       <script src="3rd_party/js/main.js"></script>\r
-\r
-       </body>\r
-</html>\r
+<!DOCTYPE HTML>
+<!--
+       Phantom by HTML5 UP
+       html5up.net | @ajlkn
+       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+       <head>
+               <title>Phantom by HTML5 UP</title>
+               <meta charset="utf-8" />
+               <meta name="viewport" content="width=device-width, initial-scale=1" />
+               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
+               <link rel="stylesheet" href="3rd_party/css/main.css" />
+               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
+               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
+       </head>
+       <body>
+               <!-- Wrapper -->
+                       <div id="wrapper">
+
+                               <!-- Header -->
+                                       <header id="header">
+                                               <div class="inner">
+
+                                                       <!-- Logo -->
+                                                               <a href="index.html" class="logo">
+                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
+                                                               </a>
+
+                                                       <!-- Nav -->
+                                                       <!--    <nav>
+                                                                       <ul>
+                                                                               <li><a href="#menu">Menu</a></li>
+                                                                       </ul>
+                                                               </nav>
+                             --->
+                                               </div>
+                                       </header>
+
+                               <!-- Menu -->
+                               <!---   <nav id="menu">
+                                               <h2>Menu</h2>
+                                               <ul>
+                                                       <li><a href="index.html">Home</a></li>
+                                                       <li><a href="colorado.html">Colorado</a></li>
+                                                       <li><a href="danube.html">Danube</a></li>
+                                               </ul>
+                                       </nav>
+                --->
+                               <!-- Main -->
+                                       <div id="main">
+                                               <div class="inner">
+                                                       <header>
+                                                               <h1>Functest reporting</h1>
+                                                       </header>
+                                                       <section class="tiles">
+                                                               <article class="style5">
+                                                                       <span class="image">
+                                                                               <img src="img/pic05.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="master/functest/status-apex.html">
+                                                                               <h2>Status</h2>
+                                                                               <div class="content">
+                                                                                       <p>Scenario status</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style2">
+                                                                       <span class="image">
+                                                                               <img src="img/pic02.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="master/functest/vims-apex.html">
+                                                                               <h2>vIMS</h2>
+                                                                               <div class="content">
+                                                                                       <p>Virtual IMS</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style3">
+                                                                       <span class="image">
+                                                                               <img src="img/pic03.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="master/functest/tempest-apex.html">
+                                                                               <h2>Tempest</h2>
+                                                                               <div class="content">
+                                                                                       <p>Tempest OpenStack suite</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                       </section>
+                                               </div>
+                                       </div>
+
+                               <!-- Footer -->
+                                       <footer id="footer">
+                                               <div class="inner">
+                                                       <section>
+                                                               <h2>OPNFV Testing Working group</h2>
+                                                       </section>
+                                                       <section>
+                                                               <h2>Follow</h2>
+                                                               <ul class="icons">
+                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
+                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
+                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
+                                                               </ul>
+                                                       </section>
+                                                       <ul class="copyright">
+                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+                                                       </ul>
+                                               </div>
+                                       </footer>
+
+                       </div>
+
+               <!-- Scripts -->
+                       <script src="3rd_party/js/jquery.min.js"></script>
+                       <script src="3rd_party/js/skel.min.js"></script>
+                       <script src="3rd_party/js/util.js"></script>
+                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
+                       <script src="3rd_party/js/main.js"></script>
+
+       </body>
+</html>
index b2b8b46..c6627ff 100644 (file)
-<!DOCTYPE HTML>\r
-<!--\r
-       Phantom by HTML5 UP\r
-       html5up.net | @ajlkn\r
-       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)\r
--->\r
-<html>\r
-       <head>\r
-               <title>OPNFV reporting</title>\r
-               <meta charset="utf-8" />\r
-               <meta name="viewport" content="width=device-width, initial-scale=1" />\r
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->\r
-               <link rel="stylesheet" href="3rd_party/css/main.css" />\r
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->\r
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->\r
-       </head>\r
-       <body>\r
-               <!-- Wrapper -->\r
-                       <div id="wrapper">\r
-\r
-                               <!-- Header -->\r
-                                       <header id="header">\r
-                                               <div class="inner">\r
-\r
-                                                       <!-- Logo -->\r
-                                                               <a href="index.html" class="logo">\r
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>\r
-                                                               </a>\r
-\r
-                                                       <!-- Nav -->\r
-                                                       <!--    <nav>\r
-                                                                       <ul>\r
-                                                                               <li><a href="#menu">Menu</a></li>\r
-                                                                       </ul>\r
-                                                               </nav>\r
-                             --->\r
-                                               </div>\r
-                                       </header>\r
-\r
-                               <!-- Menu -->\r
-                               <!---   <nav id="menu">\r
-                                               <h2>Menu</h2>\r
-                                               <ul>\r
-                                                       <li><a href="index.html">Home</a></li>\r
-                                                       <li><a href="colorado.html">Colorado</a></li>\r
-                                                       <li><a href="danube.html">Danube</a></li>\r
-                                               </ul>\r
-                                       </nav>\r
-                --->\r
-                               <!-- Main -->\r
-                                       <div id="main">\r
-                                               <div class="inner">\r
-                                                       <header>\r
-                                                               <h1>OPNFV Testing group reporting</h1>\r
-                                                       </header>\r
-                                                       <section class="tiles">\r
-                                                               <article class="style3">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/colorado.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="colorado.html">\r
-                                                                               <h2>Colorado</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Colorado 1.0 released on the 22nd of September</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                               <article class="style2">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/danube.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="danube.html">\r
-                                                                               <h2>Danube</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Master</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                       </section>\r
-                                               </div>\r
-                                       </div>\r
-\r
-                               <!-- Footer -->\r
-                                       <footer id="footer">\r
-                                               <div class="inner">\r
-                                                       <section>\r
-                                                               <h2>OPNFV Testing Working group</h2>\r
-                                                       </section>\r
-                                                       <section>\r
-                                                               <h2>Follow</h2>\r
-                                                               <ul class="icons">\r
-                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>\r
-                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>\r
-                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>\r
-                                                               </ul>\r
-                                                       </section>\r
-                                                       <ul class="copyright">\r
-                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>\r
-                                                       </ul>\r
-                                               </div>\r
-                                       </footer>\r
-\r
-                       </div>\r
-\r
-               <!-- Scripts -->\r
-                       <script src="3rd_party/js/jquery.min.js"></script>\r
-                       <script src="3rd_party/js/skel.min.js"></script>\r
-                       <script src="3rd_party/js/util.js"></script>\r
-                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->\r
-                       <script src="3rd_party/js/main.js"></script>\r
-\r
-       </body>\r
-</html>\r
+<!DOCTYPE HTML>
+<!--
+       Phantom by HTML5 UP
+       html5up.net | @ajlkn
+       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+       <head>
+               <title>OPNFV reporting</title>
+               <meta charset="utf-8" />
+               <meta name="viewport" content="width=device-width, initial-scale=1" />
+               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
+               <link rel="stylesheet" href="3rd_party/css/main.css" />
+               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
+               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
+       </head>
+       <body>
+               <!-- Wrapper -->
+                       <div id="wrapper">
+
+                               <!-- Header -->
+                                       <header id="header">
+                                               <div class="inner">
+
+                                                       <!-- Logo -->
+                                                               <a href="index.html" class="logo">
+                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
+                                                               </a>
+
+                                                       <!-- Nav -->
+                                                       <!--    <nav>
+                                                                       <ul>
+                                                                               <li><a href="#menu">Menu</a></li>
+                                                                       </ul>
+                                                               </nav>
+                             --->
+                                               </div>
+                                       </header>
+
+                               <!-- Menu -->
+                               <!---   <nav id="menu">
+                                               <h2>Menu</h2>
+                                               <ul>
+                                                       <li><a href="index.html">Home</a></li>
+                                                       <li><a href="colorado.html">Colorado</a></li>
+                                                       <li><a href="danube.html">Danube</a></li>
+                                               </ul>
+                                       </nav>
+                --->
+                               <!-- Main -->
+                                       <div id="main">
+                                               <div class="inner">
+                                                       <header>
+                                                               <h1>OPNFV Testing group reporting</h1>
+                                                       </header>
+                                                       <section class="tiles">
+                                                               <article class="style3">
+                                                                       <span class="image">
+                                                                               <img src="img/colorado.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="colorado.html">
+                                                                               <h2>Colorado</h2>
+                                                                               <div class="content">
+                                                                                       <p>Colorado 1.0 released on the 22nd of September</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style2">
+                                                                       <span class="image">
+                                                                               <img src="img/danube.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="danube.html">
+                                                                               <h2>Danube</h2>
+                                                                               <div class="content">
+                                                                                       <p>Danube 1.0 planned on the 22nd of March</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style6">
+                                                                       <span class="image">
+                                                                               <img src="img/euphrates.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="master.html">
+                                                                               <h2>Euphrates</h2>
+                                                                               <div class="content">
+                                                                                       <p>Master</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                       </section>
+                                               </div>
+                                       </div>
+
+                               <!-- Footer -->
+                                       <footer id="footer">
+                                               <div class="inner">
+                                                       <section>
+                                                               <h2>OPNFV Testing Working group</h2>
+                                                       </section>
+                                                       <section>
+                                                               <h2>Follow</h2>
+                                                               <ul class="icons">
+                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
+                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
+                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
+                                                               </ul>
+                                                       </section>
+                                                       <ul class="copyright">
+                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+                                                       </ul>
+                                               </div>
+                                       </footer>
+
+                       </div>
+
+               <!-- Scripts -->
+                       <script src="3rd_party/js/jquery.min.js"></script>
+                       <script src="3rd_party/js/skel.min.js"></script>
+                       <script src="3rd_party/js/util.js"></script>
+                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
+                       <script src="3rd_party/js/main.js"></script>
+
+       </body>
+</html>
diff --git a/utils/test/reporting/html/master.html b/utils/test/reporting/html/master.html
new file mode 100644 (file)
index 0000000..438bf20
--- /dev/null
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML>
+<!--
+       Phantom by HTML5 UP
+       html5up.net | @ajlkn
+       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+       <head>
+               <title>Phantom by HTML5 UP</title>
+               <meta charset="utf-8" />
+               <meta name="viewport" content="width=device-width, initial-scale=1" />
+               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
+               <link rel="stylesheet" href="3rd_party/css/main.css" />
+               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
+               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
+       </head>
+       <body>
+               <!-- Wrapper -->
+                       <div id="wrapper">
+
+                               <!-- Header -->
+                                       <header id="header">
+                                               <div class="inner">
+
+                                                       <!-- Logo -->
+                                                               <a href="index.html" class="logo">
+                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
+                                                               </a>
+
+                                                       <!-- Nav -->
+                                                       <!--    <nav>
+                                                                       <ul>
+                                                                               <li><a href="#menu">Menu</a></li>
+                                                                       </ul>
+                                                               </nav>
+                             --->
+                                               </div>
+                                       </header>
+
+                               <!-- Menu -->
+                               <!---   <nav id="menu">
+                                               <h2>Menu</h2>
+                                               <ul>
+                                                       <li><a href="index.html">Home</a></li>
+                                                       <li><a href="colorado.html">Colorado</a></li>
+                                                       <li><a href="danube.html">Danube</a></li>
+                                               </ul>
+                                       </nav>
+                --->
+                               <!-- Main -->
+                                       <div id="main">
+                                               <div class="inner">
+                                                       <header>
+                                                               <h1>Master reporting</h1>
+                                                       </header>
+                                                       <section class="tiles">
+                                                               <article class="style3">
+                                                                       <span class="image">
+                                                                               <img src="img/functest.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="functest-master.html">
+                                                                               <h2>Functest</h2>
+                                                                               <div class="content">
+                                                                                       <p>Functional testing</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style2">
+                                                                       <span class="image">
+                                                                               <img src="img/yardstick.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="master/yardstick/status-apex.html">
+                                                                               <h2>Yardstick</h2>
+                                                                               <div class="content">
+                                                                                       <p>Qualification and performance testing</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                               <article class="style4">
+                                                                       <span class="image">
+                                                                               <img src="img/storperf.jpg" alt="" />
+                                                                       </span>
+                                                                       <a href="master/storperf/status-apex.html">
+                                                                               <h2>Storperf</h2>
+                                                                               <div class="content">
+                                                                                       <p>Storage testing</p>
+                                                                               </div>
+                                                                       </a>
+                                                               </article>
+                                                       </section>
+                                               </div>
+                                       </div>
+
+                               <!-- Footer -->
+                                       <footer id="footer">
+                                               <div class="inner">
+                                                       <section>
+                                                               <h2>OPNFV Testing Working group</h2>
+                                                       </section>
+                                                       <section>
+                                                               <h2>Follow</h2>
+                                                               <ul class="icons">
+                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
+                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
+                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
+                                                               </ul>
+                                                       </section>
+                                                       <ul class="copyright">
+                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+                                                       </ul>
+                                               </div>
+                                       </footer>
+
+                       </div>
+
+               <!-- Scripts -->
+                       <script src="3rd_party/js/jquery.min.js"></script>
+                       <script src="3rd_party/js/skel.min.js"></script>
+                       <script src="3rd_party/js/util.js"></script>
+                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
+                       <script src="3rd_party/js/main.js"></script>
+
+       </body>
+</html>
diff --git a/utils/test/reporting/img/euphrates.jpg b/utils/test/reporting/img/euphrates.jpg
new file mode 100644 (file)
index 0000000..3625b50
Binary files /dev/null and b/utils/test/reporting/img/euphrates.jpg differ
index 81e976a..33c7cc2 100644 (file)
@@ -8,6 +8,7 @@ general:
 
     versions:
         - master
+        - danube
 
     log:
         log_file: reporting.log
index 47d67f3..aab7a3f 100644 (file)
@@ -283,6 +283,9 @@ def getJenkinsUrl(build_tag):
     except:
         print('Impossible to get jenkins url:')
 
+    if "jenkins-" not in build_tag:
+        jenkins_url = None
+
     return jenkins_url