Merge "Enable all yardstick tasks on baremetal for daisy"
authorSerena Feng <feng.xiaowei@zte.com.cn>
Fri, 13 Apr 2018 06:12:56 +0000 (06:12 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 13 Apr 2018 06:12:56 +0000 (06:12 +0000)
15 files changed:
jjb/apex/apex-deploy.sh
jjb/apex/apex-download-artifact.sh
jjb/apex/apex-verify-jobs.yml
jjb/barometer/barometer.yml
jjb/bottlenecks/bottlenecks-project-jobs.yml
jjb/calipso/calipso.yml
jjb/container4nfv/container4nfv-project.yml
jjb/daisy4nfv/daisy-daily-jobs.yml
jjb/domino/domino.yml
jjb/global/installer-params.yml
jjb/global/releng-macros.yml
jjb/ovn4nfv/ovn4nfv-project-jobs.yml
jjb/sfc/sfc-project-jobs.yml
jjb/vswitchperf/vswitchperf.yml
jjb/xci/xci-run-functest.sh

index 94d4642..958e4bf 100755 (executable)
@@ -13,21 +13,8 @@ echo
 if [ -z "$DEPLOY_SCENARIO" ]; then
   echo "Deploy scenario not set!"
   exit 1
-elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
-  echo "Detecting Gating scenario..."
-  if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then
-    echo "ERROR: Gate job triggered without comment!"
-    exit 1
-  else
-    DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$')
-    if [ -z "$DEPLOY_SCENARIO" ]; then
-      echo "ERROR: Unable to detect scenario in Gerrit Comment!"
-      echo "Format of comment to trigger gate should be 'start-gate-scenario: <scenario>'"
-      exit 1
-    else
-      echo "Gate scenario detected: ${DEPLOY_SCENARIO}"
-    fi
-  fi
+else
+  echo "Deploy scenario: ${DEPLOY_SCENARIO}"
 fi
 
 # Dev or RPM/ISO build
@@ -143,8 +130,6 @@ fi
 
 if [ "$IPV6_FLAG" == "True" ]; then
   NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml"
-elif echo ${DEPLOY_SCENARIO} | grep fdio; then
-  NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_vpp.yaml"
 else
   NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
 fi
index 066d612..6c0f8fe 100755 (executable)
@@ -13,21 +13,8 @@ echo
 if [ -z "$DEPLOY_SCENARIO" ]; then
   echo "Deploy scenario not set!"
   exit 1
-elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
-  echo "Detecting Gating scenario..."
-  if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then
-    echo "ERROR: Gate job triggered without comment!"
-    exit 1
-  else
-    DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$')
-    if [ -z "$DEPLOY_SCENARIO" ]; then
-      echo "ERROR: Unable to detect scenario in Gerrit Comment!"
-      echo "Format of comment to trigger gate should be 'start-gate-scenario: <scenario>'"
-      exit 1
-    else
-      echo "Gate scenario detected: ${DEPLOY_SCENARIO}"
-    fi
-  fi
+else
+  echo "Deploy scenario: ${DEPLOY_SCENARIO}"
 fi
 
 # if upstream we do not need to download anything
index 79b3588..318fc96 100644 (file)
           option: 'project'
 
     builders:
+      # yamllint disable rule:line-length
+      - shell: |
+          echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os|k8s-.*$'
+      # yamllint enable rule:line-length
+      - inject:
+          properties-file: detected_scenario
       - multijob:
           name: deploy-virtual
           condition: SUCCESSFUL
               current-parameters: false
               predefined-parameters: |
                 ARTIFACT_VERSION=$ARTIFACT_VERSION
-                DEPLOY_SCENARIO=gate
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 OPNFV_CLEAN=yes
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-      # yamllint disable rule:line-length
-      - shell: |
-          echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os-.*') > detected_scenario
-      # yamllint enable rule:line-length
-      - inject:
-          properties-file: detected_scenario
       - multijob:
           name: functest-smoke
           condition: ALWAYS
index a8d314a..9217620 100644 (file)
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
 
 - job-template:
     name: 'barometer-verify-{stream}'
index bebac99..d4930d7 100644 (file)
           gs-pathname: '/{stream}'
           gs-packagepath: '/{stream}/{suite}'
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          gs-packagepath: '/{stream}/{suite}'
-          disabled: false
 
     suite:
       - 'posca_stress_traffic'
index b855752..6701e7c 100644 (file)
@@ -15,9 +15,6 @@
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          disabled: false
 
 - job-template:
     name: 'calipso-verify-{stream}'
index 4bd2a80..194a1a9 100644 (file)
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
 
 - job-template:
     name: 'container4nfv-verify-{stream}'
index 800de92..4eaa39a 100644 (file)
       - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
+      - 'deploy-scenario'
 
     builders:
       - description-setter:
       - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
+      - 'deploy-scenario'
       - string:
           name: DEPLOY_TIMEOUT
           default: '150'
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: ''
 # Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
 - trigger:
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: ''
 # ovs_dpdk Scenarios
 - trigger:
     name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
-      - timed: '0 0 * * *'
+      - timed: '0 0,6 * * *'
 # Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
 - trigger:
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 12,18 * * *'
 # ovs_dpdk Scenarios
 - trigger:
     name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'
index 7fc818c..e912604 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
 
 - job-template:
     name: 'domino-verify-{stream}'
index 683ef78..f663c45 100644 (file)
           name: EXTERNAL_NETWORK
           default: 'external'
           description: 'external network for test'
+
+- parameter:
+    name: 'deploy-scenario'
+    parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
+          description: "OPNFV deployment scenario"
index 205802f..d70e7e0 100644 (file)
           default: 'refs/heads/{branch}'
           description: "Default refspec needed for manually triggering."
 
+##
+# Reporting Deployment Results
+#
+# To report deployment results to
+# http://testresults.opnfv.org/test/#/deployresults, add the following
+# parameters, builders, and publishers to a deployment job:
+#
+#   parameters:
+#    - testapi-parameter
+#
+#   builders:
+#    - track-begin-timestamp
+#
+#   publishers:
+#    - report-provision-result
+#
+# Note: The following string parameter must also exist, as they are used
+#       when reporting the provision result:
+#
+#  * INSTALLER
+#  * INSTALLER_VERSION
+#  * DEPLOY_SCENARIO
+#
+# most installers include these but you should verify first before
+# adding the publisher, otherwise the deployment build may be marked
+# unstable.
+#
+##
 - parameter:
     name: testapi-parameter
     parameters:
           name: TESTAPI_URL
           default: 'http://testresults.opnfv.org/test/api/v1'
           description: "Default TestAPI URL, currently using v1"
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-          description: "OPNFV deployment scenario"
       - string:
           name: INSTALLER_VERSION
           default: 'master'
index 0316ff7..2ce4b6d 100644 (file)
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
 
     jobs:
       - 'ovn4nfv-build-{stream}'
index 1fb4d99..fea7924 100644 (file)
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
 
 - job-template:
     name: 'sfc-verify-{stream}'
index 01a154a..ba0742f 100644 (file)
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
 
 - job-template:
 
index 3ae6a8d..6d43c97 100755 (executable)
@@ -47,7 +47,7 @@ fi
 export XCI_PATH=/home/devuser/releng-xci
 export XCI_VENV=${XCI_PATH}/venv
 
-ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; source ${XCI_PATH}/.cache/xci.env && cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; while read var; do declare -x \"\${var}\" 2>/dev/null; done < ${XCI_PATH}/.cache/xci.env && cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
 echo "Running functest"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh"
 # Record exit code