Merge "bifrost: test-bifrost-deployment.sh: Use the new 'openssh-server' dib element"
authorAric Gardner <agardner@linuxfoundation.org>
Wed, 7 Dec 2016 23:49:07 +0000 (23:49 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 7 Dec 2016 23:49:07 +0000 (23:49 +0000)
55 files changed:
jjb/apex/apex.yml
jjb/armband/armband-deploy.sh
jjb/armband/armband-verify-jobs.yml
jjb/availability/availability.yml
jjb/bottlenecks/bottlenecks-project-jobs.yml
jjb/compass4nfv/compass-ci-jobs.yml
jjb/compass4nfv/compass-deploy.sh
jjb/compass4nfv/compass-verify-jobs.yml
jjb/conductor/conductor.yml
jjb/copper/copper.yml
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
jjb/doctor/doctor.yml
jjb/domino/domino.yml
jjb/dovetail/dovetail-ci-jobs.yml
jjb/dovetail/dovetail-cleanup.sh
jjb/dovetail/dovetail-project-jobs.yml
jjb/dovetail/dovetail-run.sh
jjb/dpacc/dpacc.yml
jjb/escalator/escalator.yml
jjb/fastpathmetrics/fastpathmetrics.yml
jjb/fuel/fuel-project-jobs.yml
jjb/fuel/fuel-verify-jobs-experimental.yml
jjb/fuel/fuel-verify-jobs.yml
jjb/functest/functest-ci-jobs.yml
jjb/functest/functest-project-jobs.yml
jjb/functest/set-functest-env.sh
jjb/infra/bifrost-verify.sh
jjb/ipv6/ipv6.yml
jjb/joid/joid-verify-jobs.yml
jjb/kvmfornfv/kvmfornfv.yml
jjb/moon/moon.yml
jjb/multisite/multisite.yml
jjb/netready/netready.yml
jjb/octopus/octopus.yml
jjb/onosfw/onosfw.yml
jjb/opnfvdocs/opnfvdocs.yml
jjb/ovsnfv/ovsnfv.yml
jjb/parser/parser.yml
jjb/pharos/pharos.yml
jjb/prediction/prediction.yml
jjb/promise/promise.yml
jjb/qtip/qtip-ci-jobs.yml
jjb/qtip/qtip-project-jobs.yml
jjb/releng/opnfv-docker.sh
jjb/releng/opnfv-docker.yml
jjb/releng/opnfv-docs.yml
jjb/releng/opnfv-lint.yml
jjb/releng/releng-ci-jobs.yml
jjb/storperf/storperf.yml
jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
jjb/vswitchperf/vswitchperf.yml
jjb/yardstick/yardstick-project-jobs.yml
prototypes/bifrost/scripts/test-bifrost-deployment.sh
utils/test/testapi/opnfv_testapi/resources/testcase_models.py

index 8bfc53d..6011fe7 100644 (file)
@@ -59,6 +59,7 @@
          - 'os-odl_l2-nofeature-ha'
          - 'os-odl_l2-bgpvpn-ha'
          - 'os-odl_l2-fdio-noha'
+         - 'os-odl_l2-fdio-ha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
          - 'os-onos-nofeature-ha'
@@ -97,6 +98,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream}'
+          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream}/build
               OPNFV_CLEAN=yes
         - trigger-builds:
           - project: 'functest-apex-{daily-slave}-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-noha
+              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
             block: true
             same-node: true
             block-thresholds:
         - trigger-builds:
           - project: 'yardstick-apex-{slave}-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-noha
+              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
             block: true
             same-node: true
             block-thresholds:
index e0631c4..4df9acf 100755 (executable)
@@ -71,10 +71,23 @@ ISO_FILE=$WORKSPACE/opnfv.iso
 # log file name
 FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
 
+# Deploy Cache (to enable just create the deploy-cache subdir)
+# NOTE: Only available when ISO files are cached using ISOSTORE mechanism
+DEPLOY_CACHE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/}/deploy-cache
+if [[ -d "${DEPLOY_CACHE}" ]]; then
+    echo "Deploy cache dir present."
+    echo "--------------------------------------------------------"
+    echo "Fuel@OPNFV deploy cache: ${DEPLOY_CACHE}"
+    DEPLOY_CACHE="-C ${DEPLOY_CACHE}"
+else
+    DEPLOY_CACHE=""
+fi
+
 # construct the command
 DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
     -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
-    -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
+    -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
+    ${DEPLOY_CACHE}"
 
 # log info to console
 echo "Deployment parameters"
index 90fdd7e..f99ed57 100644 (file)
@@ -68,6 +68,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index c42efff..485010d 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 523d363..27eb01a 100644 (file)
@@ -54,6 +54,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -94,6 +95,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index b70bfc6..330c6dd 100644 (file)
         - 'os-nosdn-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-odl_l2-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-odl_l3-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-onos-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-ocl-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-onos-sfc-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-odl_l2-moon-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: 'xenial'
         - 'os-nosdn-kvm-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
               predefined-parameters: |
                 DEPLOY_SCENARIO={scenario}
                 COMPASS_OS_VERSION={os-version}
-                COMPASS_OS_VERSION_OPTION={openstack-os-version}
               same-node: true
               block: true
         - trigger-builds:
         #dovetail only master by now, not sync with A/B/C branches
         #here the stream means the SUT stream, dovetail stream is defined in its own job
         - trigger-builds:
-            - project: 'dovetail-compass-{pod}-basic-{stream}'
+            - project: 'dovetail-compass-{pod}-debug-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
                 - 'mitaka'
                 - 'newton'
                 - 'liberty'
-        - choice:
-            name: COMPASS_OS_VERSION_OPTION
-            choices:
-                - ''
-                - 'xenial'
 
 ########################
 # trigger macros
index 2567179..017741a 100644 (file)
@@ -29,19 +29,9 @@ cd $WORKSPACE
 
 export OS_VERSION=${COMPASS_OS_VERSION}
 export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
-if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then
-    export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
-    export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
-fi
-if [[ "${OPENSTACK_VERSION}" = "newton" ]]; then
-    export OS_VERSION="xenial"
-    export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION}
-fi
-
 
 if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
     export NETWORK_CONF_FILE=network_ocl.yml
-    export OPENSTACK_VERSION=liberty
 elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then
     export NETWORK_CONF_FILE=network_onos.yml
 else
@@ -57,7 +47,11 @@ else
     export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
 fi
 
-./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
+export DHA=${DHA_CONF}
+export NETWORK=${NETWORK_CONF}
+
+./ci/deploy_ci.sh
+
 if [ $? -ne 0 ]; then
     echo "depolyment failed!"
     deploy_ret=1
index cc04ad3..a883ad9 100644 (file)
@@ -79,6 +79,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
-        - multijob:
-            name: smoke-test
-            condition: SUCCESSFUL
-            projects:
-                - name: 'functest-compass-virtual-suite-{stream}'
-                  current-parameters: true
-                  predefined-parameters:
-                    FUNCTEST_SUITE_NAME=healthcheck
-                  node-parameters: true
-                  kill-phase-on: NEVER
-                  abort-all-job: true
+#        - multijob:
+#            name: smoke-test
+#            condition: SUCCESSFUL
+#            projects:
+#                - name: 'functest-compass-virtual-suite-{stream}'
+#                  current-parameters: true
+#                  predefined-parameters:
+#                    FUNCTEST_SUITE_NAME=healthcheck
+#                  node-parameters: true
+#                  kill-phase-on: NEVER
+#                  abort-all-job: true
 
 - job-template:
     name: 'compass-verify-{phase}-{distro}-{stream}'
index a5f556a..15a3b59 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index b504578..80ad929 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index f8c0258..5964adb 100644 (file)
@@ -64,6 +64,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index d893b14..bd9f1b5 100644 (file)
@@ -62,6 +62,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index dfce402..7a5bd22 100644 (file)
@@ -48,6 +48,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
             name: OS_CREDS
             default: /home/jenkins/openstack.creds
             description: 'OpenStack credentials'
-        - '{installer}-defaults'
         - '{slave-label}-defaults'
-        # functest
+        - string:
+            name: INSTALLER_TYPE
+            default: '{installer}'
+            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
+            description: 'Scenario to deploy and test'
         # functest-suite-parameter
         - string:
             name: FUNCTEST_SUITE_NAME
             default: '{project}'
         - string:
             name: TESTCASE_OPTIONS
-            default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/doctor'
+            default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor'
             description: 'Addtional parameters specific to test case(s)'
         # functest-parameter
         - string:
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
 
     builders:
         - 'functest-suite-builder'
+        - shell: |
+            cp $HOME/opnfv/functest/results/{stream}/{project}.log $WORKSPACE/tests/
 
     publishers:
         - archive:
-            artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log'
+            artifacts: 'tests/*.log'
index 7cee984..d34f8fa 100644 (file)
@@ -36,6 +36,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 2921200..f32fba9 100644 (file)
             <<: *master
 #--------------------------------
     testsuite:
-        - 'basic'
+        - 'debug'
+        - 'proposed_tests'
+        - 'compliace_set'
 
     jobs:
         - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}'
             name: CI_DEBUG
             default: 'true'
             description: "Show debug output information"
+        - string:
+            name: TESTSUITE
+            default: '{testsuite}'
+            description: "dovetail testsuite to run"
+        - string:
+            name: DOVETAIL_REPO_DIR
+            default: "/home/opnfv/dovetail"
+            description: "Directory where the dovetail repository is cloned"
 
     scm:
         - git-scm:
         - description-setter:
             description: "POD: $NODE_NAME"
         - 'dovetail-cleanup'
-        - 'dovetail-{testsuite}'
+        - 'dovetail-run'
 
     publishers:
         - archive:
 # builder macros
 ########################
 - builder:
-    name: dovetail-basic
+    name: dovetail-run
     builders:
         - shell:
             !include-raw: ./dovetail-run.sh
 
+
 - builder:
     name: dovetail-fetch-os-creds
     builders:
index 297222b..f215278 100755 (executable)
@@ -1,20 +1,21 @@
 #!/bin/bash
+
 [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
 
 echo "Cleaning up docker containers/images..."
 # Remove previous running containers if exist
 if [[ ! -z $(docker ps -a | grep opnfv/dovetail) ]]; then
     echo "Removing existing opnfv/dovetail containers..."
-    docker ps -a | grep opnfv/dovetail | awk '{print $1}' | xargs docker rm -f >$redirect
+    docker ps -a | grep opnfv/dovetail | awk '{print $1}' | xargs docker rm -f >${redirect}
 fi
 
 # Remove existing images if exist
 if [[ ! -z $(docker images | grep opnfv/dovetail) ]]; then
     echo "Docker images to remove:"
-    docker images | head -1 && docker images | grep opnfv/dovetail
+    docker images | head -1 && docker images | grep opnfv/dovetail >${redirect}
     image_tags=($(docker images | grep opnfv/dovetail | awk '{print $2}'))
     for tag in "${image_tags[@]}"; do
         echo "Removing docker image opnfv/dovetail:$tag..."
-        docker rmi opnfv/dovetail:$tag >$redirect
+        docker rmi opnfv/dovetail:$tag >${redirect}
     done
 fi
index 41fd8cd..07106f6 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -79,6 +80,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index 098b7db..a41a989 100755 (executable)
@@ -22,7 +22,7 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
 elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
     # If production lab then creds may be retrieved dynamically
     # creds are on the jumphost, always in the same folder
-    labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/openrc"
+    labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
     # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
     # replace the default one by the customized one provided by jenkins config
 fi
@@ -32,26 +32,45 @@ if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FOR
     sudo iptables -I FORWARD -j RETURN
 fi
 
-opts="--privileged=true --rm"
+opts="--privileged=true -id"
 envs="-e CI_DEBUG=${CI_DEBUG} \
       -e INSTALLER_TYPE=${INSTALLER_TYPE} \
       -e INSTALLER_IP=${INSTALLER_IP} \
       -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
-      -e DEPLOY_TYPE=${DEPLOY_TYPE} \
-      -v /var/run/docker.sock:/var/run/docker.sock \
-      -v /home/opnfv/dovetail/results:/home/opnfv/dovetail/results"
+      -e DEPLOY_TYPE=${DEPLOY_TYPE}"
+results_envs="-v /var/run/docker.sock:/var/run/docker.sock \
+              -v /home/opnfv/dovetail/results:/home/opnfv/dovetail/results"
 
 # Pull the image with correct tag
 echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}"
 docker pull opnfv/dovetail:$DOCKER_TAG >$redirect
 
-# Run docker
-echo "Dovetail: docker running..."
-sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/dovetail:${DOCKER_TAG} \
-"/home/opnfv/dovetail/dovetail/run.py"
+cmd="sudo docker run ${opts} ${envs} ${results_envs} ${labconfig} ${sshkey} \
+     opnfv/dovetail:${DOCKER_TAG} /bin/bash"
+echo "Dovetail: running docker run command: ${cmd}"
+${cmd} >${redirect}
+sleep 5
+container_id=$(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | awk '{print $1}' | head -1)
+echo "Container ID=${container_id}"
+if [ -z ${container_id} ]; then
+    echo "Cannot find opnfv/dovetail container ID ${container_id}. Please check if it is existing."
+    docker ps -a
+    exit 1
+fi
+echo "COntainer Start: docker start ${container_id}"
+docker start ${container_id}
+sleep 5
+docker ps >${redirect}
+if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then
+    echo "The container opnfv/dovetail with ID=${container_id} has not been properly started. Exiting..."
+    exit 1
+fi
+
+exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE}"
+echo "Container exec command: ${exec_cmd}"
+docker exec ${container_id} ${exec_cmd}
 
-echo "Dovetail: store results..."
-sudo cp -r /home/opnfv/dovetail/results ./
+sudo cp -r ${DOVETAIL_REPO_DIR}/results ./
 #To make sure the file owner is jenkins, for the copied results files in the above line
 #if not, there will be error when next time to wipe workspace
 sudo chown -R jenkins:jenkins ${WORKSPACE}/results
index c660af5..bcad2a3 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index dba76f7..11da789 100644 (file)
@@ -60,6 +60,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index 40df385..6be6a52 100644 (file)
@@ -42,6 +42,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index 588ab0c..2aa17ab 100644 (file)
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index ae83b08..cc16133 100644 (file)
@@ -73,6 +73,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index f4bdbdd..7b86568 100644 (file)
@@ -68,6 +68,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index afeb1f9..1cded61 100644 (file)
         - string:
             name: TESTCASE_OPTIONS
             default: ''
-            description: 'Addtional parameters specific to test case(s)'
+            description: 'Additional parameters specific to test case(s)'
 - parameter:
     name: functest-parameter
     parameters:
             name: CI_DEBUG
             default: 'false'
             description: "Show debug output information"
+        - string:
+            name: RC_FILE_PATH
+            default: ''
+            description: "Path to the OS credentials file if given"
 ########################
 # trigger macros
 ########################
index 236b95d..888f0ed 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index bc30ffa..583ce80 100755 (executable)
@@ -2,8 +2,23 @@
 
 set -e
 [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-# labconfig is used only for joid
-labconfig=""
+# LAB_CONFIG is used only for joid
+
+
+if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
+    # If production lab then creds may be retrieved dynamically
+    # creds are on the jumphost, always in the same folder
+    rc_file_vol="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
+    # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+    # replace the default one by the customized one provided by jenkins config
+fi
+
+if [[ ${RC_FILE_PATH} != '' ]] && [[ -f ${RC_FILE_PATH} ]] ; then
+    # volume if credentials file path is given to Functest
+    rc_file_vol="-v $RC_FILE_PATH:/home/opnfv/functest/conf/openstack.creds"
+fi
+
+
 if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
     ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
     if sudo virsh list | grep instack; then
@@ -17,9 +32,9 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
         exit 1
     fi
     INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
-    sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
+    sshkey_vol="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
     sudo scp $ssh_options root@${INSTALLER_IP}:/home/stack/stackrc ${HOME}/stackrc
-    stackrc="-v ${HOME}/stackrc:/home/opnfv/functest/conf/stackrc"
+    stackrc_vol="-v ${HOME}/stackrc:/home/opnfv/functest/conf/stackrc"
 
     if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
         sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
@@ -27,15 +42,10 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
     if sudo iptables -C FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
         sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
     fi
-
-elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
-    # If production lab then creds may be retrieved dynamically
-    # creds are on the jumphost, always in the same folder
-    labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
-    # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
-    # replace the default one by the customized one provided by jenkins config
 fi
 
+
+
 # Set iptables rule to allow forwarding return traffic for container
 if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
     sudo iptables -I FORWARD -j RETURN
@@ -45,22 +55,28 @@ DEPLOY_TYPE=baremetal
 [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt
 
 echo "Functest: Start Docker and prepare environment"
-envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-    -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
-    -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
+
 branch=${GIT_BRANCH##*/}
 dir_result="${HOME}/opnfv/functest/results/${branch}"
 mkdir -p ${dir_result}
 sudo rm -rf ${dir_result}/*
-res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+results_vol="-v ${dir_result}:/home/opnfv/functest/results"
 custom_params=
 test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG})
 
+envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
+    -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
+    -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
+
+
+volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}"
+
+
 echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
 docker pull opnfv/functest:$DOCKER_TAG >/dev/null
 
-cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} \
-     ${res_volume} ${custom_params} ${stackrc} ${TESTCASE_OPTIONS} \
+cmd="sudo docker run --privileged=true -id ${envs} ${volumes} \
+     ${custom_params} ${TESTCASE_OPTIONS} \
      opnfv/functest:${DOCKER_TAG} /bin/bash"
 echo "Functest: Running docker run command: ${cmd}"
 ${cmd} >${redirect}
index ded4ed4..9fbb1d0 100755 (executable)
@@ -17,6 +17,9 @@ function fix_ownership() {
     if [ -z "${JOB_URL+x}" ]; then
         echo "Not running as part of Jenkins. Handle the logs manually."
     else
+        # Make sure cache exists
+        [[ ! -d ${HOME}/.cache ]] && mkdir ${HOME}/.cache
+
         sudo chown -R jenkins:jenkins $WORKSPACE
         sudo chown -R jenkins:jenkins ${HOME}/.cache
     fi
index d9dafdf..069599e 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 9d362d8..649c31b 100644 (file)
@@ -73,6 +73,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 04fce22..1c2bf50 100644 (file)
 # patch verification phases
 #####################################
     testname:
-        - 'Idle_Idle':
-            trigger_time: '@midnight'
-        - 'Stress_Idle':
-            trigger_time: '@midnight+3hours'
-        - 'Packet_Forwarding':
-            trigger_time: '@midnight+6hours'
+        - 'cyclictest'
+        - 'packet_forward'
 #####################################
 # patch verification phases
 #####################################
@@ -37,7 +33,7 @@
         - 'kvmfornfv-verify-{stream}'
         - 'kvmfornfv-verify-{phase}-{stream}'
         - 'kvmfornfv-merge-{stream}'
-        - 'kvmfornfv-{testname}-daily-{stream}'
+        - 'kvmfornfv-daily-{stream}'
         - 'kvmfornfv-{testname}-daily-{phase}-{stream}'
 #####################################
 # job templates
@@ -66,6 +62,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
             !include-raw: ./kvmfornfv-build.sh
 
 - job-template:
-    name: 'kvmfornfv-{testname}-daily-{stream}'
+    name: 'kvmfornfv-daily-{stream}'
 
     project-type: multijob
 
             choosing-strategy: 'default'
 
     triggers:
-        - timed: '{trigger_time}'
+        - timed: '@midnight'
 
     builders:
         - description-setter:
             name: build
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-Idle_Idle-daily-build-{stream}'
+                - name: 'kvmfornfv-{testname}-daily-build-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
             name: build
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-Stress_Idle-daily-build-{stream}'
-                  current-parameters: false
-                  node-parameters: false
-                  git-revision: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'kvmfornfv-Packet_Forwarding-daily-build-{stream}'
-                  current-parameters: false
-                  node-parameters: false
-                  git-revision: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'kvmfornfv-Idle_Idle-daily-test-{stream}'
+                - name: 'kvmfornfv-{testname}-daily-test-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
 
-        - multijob:
-            name: test
-            condition: SUCCESSFUL
-            projects:
-                - name: 'kvmfornfv-Stress_Idle-daily-test-{stream}'
-                  current-parameters: false
-                  node-parameters: false
-                  git-revision: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'kvmfornfv-Packet_Forwarding-daily-test-{stream}'
-                  current-parameters: false
-                  node-parameters: false
-                  git-revision: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-
-
 - job-template:
     name: 'kvmfornfv-{testname}-daily-{phase}-{stream}'
 
         - '{slave-label}-defaults'
         - 'kvmfornfv-defaults':
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: TEST_NAME
+            default: '{testname}'
+            description: "Daily job to execute kvmfornfv '{testname}' testcase."
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
         - '{project}-{testname}-daily-{phase}-macro'
-########################
-# parameter macros
-########################
-- parameter:
-    name: 'kvmfornfv-Idle_Idle-daily-test-{stream}'
-    parameters:
-        - string:
-            name: TEST_NAME
-            default: 'idle_idle'
-            description: "Daily job to run cyclictest without applying any stress"
-- parameter:
-    name: 'kvmfornfv-Stress_Idle-daily-test-{stream}'
-    parameters:
-        - string:
-            name: TEST_NAME
-            default: 'stress_idle'
-            description: "Daily job to run cyclictest with stress applied"
-- parameter:
-    name: 'kvmfornfv-Packet_Forwarding-daily-test-{stream}'
-    parameters:
-        - string:
-            name: TEST_NAME
-            default: 'packet_forward'
-            description: "Daily job to run packet forwarding test cases"
 #####################################
 # builder macros
 #####################################
         - shell:
             !include-raw: ./kvmfornfv-test.sh
 - builder:
-    name: 'kvmfornfv-Idle_Idle-daily-build-macro'
+    name: 'kvmfornfv-cyclictest-daily-build-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-build.sh
         - shell:
             !include-raw: ./kvmfornfv-upload-artifact.sh
 - builder:
-    name: 'kvmfornfv-Stress_Idle-daily-build-macro'
-    builders:
-        - shell:
-            !include-raw: ./kvmfornfv-build.sh
-        - shell:
-            !include-raw: ./kvmfornfv-upload-artifact.sh
-- builder:
-    name: 'kvmfornfv-Packet_Forwarding-daily-build-macro'
-    builders:
-        - shell:
-            !include-raw: ./kvmfornfv-build.sh
-        - shell:
-            !include-raw: ./kvmfornfv-upload-artifact.sh
-- builder:
-    name: 'kvmfornfv-Idle_Idle-daily-test-macro'
+    name: 'kvmfornfv-cyclictest-daily-test-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-download-artifact.sh
         - shell:
             !include-raw: ./kvmfornfv-test.sh
 - builder:
-    name: 'kvmfornfv-Stress_Idle-daily-test-macro'
+    name: 'kvmfornfv-packet_forward-daily-build-macro'
     builders:
         - shell:
-            !include-raw: ./kvmfornfv-download-artifact.sh
+            !include-raw: ./kvmfornfv-build.sh
         - shell:
-            !include-raw: ./kvmfornfv-test.sh
+            !include-raw: ./kvmfornfv-upload-artifact.sh
 - builder:
-    name: 'kvmfornfv-Packet_Forwarding-daily-test-macro'
+    name: 'kvmfornfv-packet_forward-daily-test-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-download-artifact.sh
         - shell:
             !include-raw: ./kvmfornfv-test.sh
-
 #####################################
 # parameter macros
 #####################################
index 55d593f..a52cf2c 100644 (file)
@@ -29,6 +29,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -53,4 +54,4 @@
         - shell:
             #!/bin/bash
             echo "launch Moon unit tests"
-            nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit
\ No newline at end of file
+            nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit
index 24c03fd..8e54299 100644 (file)
@@ -46,6 +46,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 3e2f95a..cc6769e 100644 (file)
@@ -34,6 +34,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index c4e34ca..741aa09 100644 (file)
@@ -39,6 +39,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 0c90c57..33ede47 100644 (file)
@@ -43,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 2bf87c2..724ef6a 100644 (file)
@@ -49,6 +49,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -96,6 +97,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index c6f3e4a..28d2683 100644 (file)
@@ -42,6 +42,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -96,6 +97,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index 7f73a13..cd6c6e0 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index f7ea622..92216ee 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index a95cd98..951188c 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 1a4d628..f620f6f 100644 (file)
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index cca8cee..1c62df6 100644 (file)
@@ -85,7 +85,7 @@
 
     publishers:
         - email:
-            recipients: nauman.ahad@xflowresearch.com, mofassir.arif@xflowresearch.com, vikram@nvirters.com, zhang.yujunz@zte.com.cn
+            recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn
 
 ###########################
 #biuilder macros
index f192e86..8b406fe 100644 (file)
@@ -37,6 +37,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index e0fbb75..6f8d81a 100644 (file)
@@ -66,7 +66,13 @@ echo "Current branch: $branch"
 if [[ "$branch" == "master" ]]; then
     DOCKER_TAG="latest"
 else
-    DOCKER_TAG="stable"
+    if [[ "$RELEASE_VERSION" != "" ]]; then
+        release=$(echo $branch|sed 's/.*\///')
+        DOCKER_TAG=${release}.${RELEASE_VERSION}
+        # e.g. colorado.1.0, colorado.2.0, colorado.3.0
+    else:
+        DOCKER_TAG="stable"
+    fi
 fi
 
 # Start the build
index 0df0ddf..7a4c9af 100644 (file)
             name: DOCKER_REPO_NAME
             default: "opnfv/{project}"
             description: "Dockerhub repo to be pushed to."
+        - string:
+            name: RELEASE_VERSION
+            default: ""
+            description: "Release version, e.g. 1.0, 2.0, 3.0"
 
     scm:
         - git-scm:
index 442e8ea..a183745 100644 (file)
@@ -46,6 +46,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -98,6 +99,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index 652f282..c2624de 100644 (file)
@@ -43,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index ccfe11e..fc77c2d 100644 (file)
@@ -23,6 +23,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -77,6 +78,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index 026b643..4e72af5 100644 (file)
@@ -43,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index c988c06..6dd3acf 100644 (file)
@@ -34,6 +34,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
index 5f952de..cda5128 100644 (file)
@@ -85,6 +85,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index abc6eeb..afa6b78 100644 (file)
@@ -45,6 +45,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -88,6 +89,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
index 3f759d1..90f014c 100755 (executable)
@@ -18,7 +18,7 @@ ENABLE_VENV="false"
 USE_DHCP="false"
 USE_VENV="false"
 BUILD_IMAGE=true
-PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-2400}
+PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600}
 
 # Set defaults for ansible command-line options to drive the different
 # tests.
index c9dce60..e1f2fb6 100644 (file)
@@ -41,7 +41,8 @@ class TestcaseUpdateRequest(object):
 
 @swagger.model()
 class Testcase(object):
-    def __init__(self):
+    def __init__(self, _id=None, name=None, project_name=None,
+                 description=None, url=None, creation_date=None):
         self._id = None
         self.name = None
         self.project_name = None