Merge "fuel, armband: basic healthcheck in verify jobs"
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Fri, 4 May 2018 19:48:11 +0000 (19:48 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 4 May 2018 19:48:11 +0000 (19:48 +0000)
94 files changed:
jjb/apex/apex-build.sh
jjb/apex/apex-deploy.sh
jjb/apex/apex-download-artifact.sh
jjb/apex/apex-fetch-logs.sh
jjb/apex/apex-iso-verify.sh
jjb/apex/apex-unit-test.sh
jjb/apex/apex-upload-artifact.sh
jjb/apex/apex-verify-jobs.yml
jjb/apex/apex.yml
jjb/apex/apex.yml.j2
jjb/apex/scenarios.yaml.hidden
jjb/armband/armband-ci-jobs.yml
jjb/barometer/barometer.yml
jjb/bottlenecks/bottlenecks-project-jobs.yml
jjb/calipso/calipso.yml
jjb/ci_gate_security/opnfv-ci-gate-security.yml
jjb/clover/clover-project.yml
jjb/compass4nfv/compass-ci-jobs.yml
jjb/compass4nfv/compass-project-jobs.yml
jjb/compass4nfv/compass-verify-jobs.yml
jjb/container4nfv/container4nfv-arm64.yml
jjb/container4nfv/container4nfv-project.yml
jjb/container4nfv/yardstick-arm64.yml
jjb/daisy4nfv/daisy-daily-jobs.yml
jjb/daisy4nfv/daisy-project-jobs.yml
jjb/doctor/doctor.yml
jjb/domino/domino.yml
jjb/dovetail/dovetail-ci-jobs.yml
jjb/dovetail/dovetail-run.sh
jjb/fuel/fuel-daily-jobs.yml
jjb/fuel/fuel-weekly-jobs.yml
jjb/functest/functest-alpine.sh
jjb/functest/functest-daily-jobs.yml
jjb/functest/functest-k8.sh
jjb/functest/functest-kubernetes-docker.yml
jjb/functest/functest-kubernetes-project-jobs.yml
jjb/functest/functest-project-jobs.yml
jjb/functest/functest-weekly-jobs.yml
jjb/functest/xtesting-docker.yml
jjb/functest/xtesting-project-jobs.yml
jjb/global/installer-params.yml
jjb/global/releng-macros.yml
jjb/global/slave-params.yml
jjb/joid/joid-daily-jobs.yml
jjb/nfvbench/nfvbench.yml
jjb/octopus/octopus.yml [deleted file]
jjb/opnfvdocs/docs-rtd.yaml
jjb/opnfvdocs/opnfvdocs.yml
jjb/ovn4nfv/ovn4nfv-project-jobs.yml
jjb/parser/parser.yml
jjb/prediction/prediction.yml [deleted file]
jjb/qtip/qtip-experimental-jobs.yml
jjb/qtip/qtip-validate-jobs.yml
jjb/releng/opnfv-docker-arm.yml
jjb/releng/opnfv-docker.yml
jjb/releng/opnfv-lint.yml
jjb/releng/opnfv-utils.yml
jjb/sfc/sfc-project-jobs.yml
jjb/vswitchperf/vswitchperf.yml
jjb/xci/bifrost-verify-jobs.yml
jjb/xci/bifrost-verify.sh
jjb/xci/xci-run-functest.sh
jjb/xci/xci-set-scenario.sh
jjb/yardstick/yardstick-daily-jobs.yml
jjb/yardstick/yardstick-project-jobs.yml
releases/fraser/apex.yaml
releases/fraser/armband.yml
releases/fraser/auto.yaml
releases/fraser/availability.yaml
releases/fraser/barometer.yaml
releases/fraser/bottlenecks.yaml
releases/fraser/calipso.yaml [new file with mode: 0644]
releases/fraser/clover.yaml
releases/fraser/compass4nfv.yaml
releases/fraser/container4nfv.yaml
releases/fraser/daisy.yaml
releases/fraser/doctor.yaml
releases/fraser/fuel.yaml
releases/fraser/functest.yaml
releases/fraser/ipv6.yaml
releases/fraser/joid.yaml
releases/fraser/nfvbench.yaml
releases/fraser/opnfvdocs.yaml [new file with mode: 0644]
releases/fraser/ovn4nfv.yaml
releases/fraser/parser.yaml
releases/fraser/qtip.yaml
releases/fraser/samplevnf.yaml
releases/fraser/sdnvpn.yaml
releases/fraser/sfc.yaml
releases/fraser/snaps.yaml
releases/fraser/stor4nfv.yaml
releases/fraser/storperf.yaml
releases/fraser/vswitchperf.yaml
releases/fraser/yardstick.yaml

index cf59998..aabd20e 100755 (executable)
@@ -18,10 +18,18 @@ elif echo $BUILD_TAG | grep "csit" 1> /dev/null; then
   export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY"
 elif [ "$ARTIFACT_VERSION" == "daily" ]; then
   export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
-  export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso"
+  if [ "$BRANCH" == 'master' ]; then
+    export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY"
+  else
+    export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso"
+  fi
 else
   export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
-  export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso"
+  if [ "$BRANCH" == 'master' ]; then
+    export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY"
+  else
+    export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso"
+  fi
 fi
 
 # Temporary hack until we fix apex build script
@@ -46,7 +54,7 @@ echo "Cache Directory Contents:"
 echo "-------------------------"
 ls -al $CACHE_DIRECTORY
 
-if [[ "$BUILD_ARGS" =~ '--iso' ]]; then
+if [[ "$BUILD_ARGS" =~ '--iso' && "$BRANCH" != 'master' ]]; then
   mkdir -p /tmp/apex-iso/
   rm -f /tmp/apex-iso/*.iso
   cp -f $BUILD_DIRECTORY/../.build/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso /tmp/apex-iso/
@@ -54,18 +62,32 @@ fi
 
 if ! echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then
   echo "Writing opnfv.properties file"
-  # save information regarding artifact into file
-  (
-    echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
-    echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
-    echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
-    echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
-    echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/../.build/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
-    echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.src.rpm"
-    echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.noarch.rpm"
-    echo "OPNFV_RPM_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/../.build/noarch/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
-    echo "OPNFV_BUILD_URL=$BUILD_URL"
-  ) > $WORKSPACE/opnfv.properties
+  if [ "$BRANCH" != master ]; then
+    # save information regarding artifact into file
+    (
+      echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
+      echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
+      echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
+      echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
+      echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/../.build/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
+      echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.src.rpm"
+      echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.noarch.rpm"
+      echo "OPNFV_RPM_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/../.build/noarch/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
+      echo "OPNFV_BUILD_URL=$BUILD_URL"
+    ) > $WORKSPACE/opnfv.properties
+  else
+    # save information regarding artifact into file
+    # we only generate the python package for master
+    (
+      echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
+      echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
+      echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
+      echo "OPNFV_SRPM_URL=$GS_URL/python34-opnfv-apex-$RPM_VERSION.src.rpm"
+      echo "OPNFV_RPM_URL=$GS_URL/python34-opnfv-apex-$RPM_VERSION.noarch.rpm"
+      echo "OPNFV_RPM_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/../.build/noarch/python34-opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
+      echo "OPNFV_BUILD_URL=$BUILD_URL"
+    ) > $WORKSPACE/opnfv.properties
+  fi
 fi
 echo "--------------------------------------------------------"
 echo "Done!"
index 94d4642..35c2b85 100755 (executable)
@@ -13,38 +13,31 @@ 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
-# For upstream deployments we currently only use git repo and not RPM
-# Need to decide after Fraser if we want to use RPM or not for upstream
-if [[ "$ARTIFACT_VERSION" =~ dev || "$DEPLOY_SCENARIO" =~ "upstream" ]]; then
+if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   # Settings for deploying from git workspace
   DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
   NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
-  DEPLOY_CMD="opnfv-deploy --image-dir ${WORKSPACE}/.build"
   CLEAN_CMD="opnfv-clean"
-  RESOURCES="${WORKSPACE}/.build/"
+  # if we are using master, then we are downloading/caching upstream images
+  # we want to use that built in mechanism to avoid re-downloading every job
+  # so we use a dedicated folder to hold the upstream cache
+  UPSTREAM_CACHE=$HOME/upstream_cache
+  if [ "$BRANCH" == 'master' ]; then
+    mkdir -p ${UPSTREAM_CACHE}
+    RESOURCES=$UPSTREAM_CACHE
+  else
+    RESOURCES="${WORKSPACE}/.build/"
+  fi
   CONFIG="${WORKSPACE}/build"
   BASE=$CONFIG
   IMAGES=$RESOURCES
   LIB="${WORKSPACE}/lib"
-
+  DEPLOY_CMD="opnfv-deploy --image-dir ${RESOURCES}"
   # Ensure artifacts were downloaded and extracted correctly
   # TODO(trozet) add verification here
 
@@ -56,9 +49,17 @@ if [[ "$ARTIFACT_VERSION" =~ dev || "$DEPLOY_SCENARIO" =~ "upstream" ]]; then
 else
   DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
   NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"
-  DEPLOY_CMD="opnfv-deploy"
   CLEAN_CMD="opnfv-clean"
-  RESOURCES="/var/opt/opnfv/images"
+  # set to use different directory here because upon RPM removal this
+  # directory will be wiped in daily
+  UPSTREAM_CACHE=$HOME/upstream_cache
+  if [ "$BRANCH" == 'master' ]; then
+    mkdir -p ${UPSTREAM_CACHE}
+    RESOURCES=$UPSTREAM_CACHE
+  else
+    RESOURCES="/var/opt/opnfv/images"
+  fi
+  DEPLOY_CMD="opnfv-deploy --image-dir ${RESOURCES}"
   CONFIG="/var/opt/opnfv"
   BASE=$CONFIG
   IMAGES=$RESOURCES
@@ -136,15 +137,13 @@ else
   DEPLOY_CMD="${DEPLOY_CMD} -i ${INVENTORY_FILE}"
 fi
 
-if [[ "$DEPLOY_SCENARIO" =~ "upstream" ]]; then
+if [[ "$BRANCH" == "master" ]]; then
   echo "Upstream deployment detected"
   DEPLOY_CMD="${DEPLOY_CMD} --upstream"
 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..3efe1cb 100755 (executable)
@@ -13,36 +13,24 @@ 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
-if [[ "$DEPLOY_SCENARIO" =~ upstream ]]; then
-  echo "Upstream deployment detected, skipping download artifact"
-elif [[ "$ARTIFACT_VERSION" =~ dev ]]; then
-  # dev build
-  GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$')
-  export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}"
-  # get build artifact
-  pushd ${BUILD_DIRECTORY} > /dev/null
-  echo "Downloading packaged dev build: apex-${OPNFV_ARTIFACT_VERSION}.tar.gz"
-  curl --fail -s -o $BUILD_DIRECTORY/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz http://$GS_URL/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
-  tar -xvf apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
-  popd > /dev/null
+if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
+  if [ "$BRANCH" == 'master' ]; then
+    echo "Skipping download of artifacts for master branch"
+  else
+    # dev build
+    GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$')
+    export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}"
+    # get build artifact
+    pushd ${BUILD_DIRECTORY} > /dev/null
+    echo "Downloading packaged dev build: apex-${OPNFV_ARTIFACT_VERSION}.tar.gz"
+    curl --fail -s -o $BUILD_DIRECTORY/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz http://$GS_URL/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
+    tar -xvf apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
+    popd > /dev/null
+  fi
 else
   echo "Will use RPMs..."
 
@@ -58,20 +46,16 @@ else
   RPM_INSTALL_PATH=$(echo "http://"$OPNFV_RPM_URL | sed 's/\/'"$(basename $OPNFV_RPM_URL)"'//')
   RPM_LIST=$(basename $OPNFV_RPM_URL)
 
-  # find version of RPM
-  VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)')
-  # build RPM List which already includes base Apex RPM
-  RPM_LIST+=" opnfv-apex-undercloud-${VERSION_EXTENSION}.noarch.rpm"
-
-  # add back legacy support for danube
-  if [ "$BRANCH" == 'stable/danube' ]; then
-    RPM_LIST+=" opnfv-apex-common-${VERSION_EXTENSION}.noarch.rpm"
-  else
+  if [ "$BRANCH" != 'master' ]; then
+    # find version of RPM
+    VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)')
+    # build RPM List which already includes base Apex RPM
+    RPM_LIST+=" opnfv-apex-undercloud-${VERSION_EXTENSION}.noarch.rpm"
     RPM_LIST+=" python34-opnfv-apex-${VERSION_EXTENSION}.noarch.rpm"
   fi
 
   # remove old / install new RPMs
-  if rpm -q opnfv-apex > /dev/null; then
+  if rpm -q python34-opnfv-apex > /dev/null; then
     INSTALLED_RPMS=$(rpm -qa | grep apex)
     if [ -n "$INSTALLED_RPMS" ]; then
       sudo yum remove -y ${INSTALLED_RPMS}
index f25f456..bdb2252 100755 (executable)
@@ -14,9 +14,10 @@ if sudo opnfv-pyutil --fetch-logs; then
       echo "WARNING: Unable to determine log location.  Logs will not be uploaded"
       exit 0
   else
+    sudo chmod 777 ${LOG_LOCATION}
     UPLOAD_LOCATION="${GS_URL}/logs/${JOB_NAME}/${BUILD_NUMBER}/"
-    gsutil cp -r ${LOG_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log
-    echo "Logs available at https://${UPLOAD_LOCATION}/$(basename $LOG_LOCATION)"
+    gsutil -m cp -r ${LOG_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log
+    echo -e "Logs available at: \n$(find ${LOG_LOCATION} -type f | sed -n 's#^/tmp/#http://'$UPLOAD_LOCATION'#p')"
   fi
 else
   echo "WARNING: Log retrieval failed.  No logs will be uploaded"
index 4faeb60..f349376 100755 (executable)
@@ -8,6 +8,11 @@ echo "Starting the Apex iso verify."
 echo "--------------------------------------------------------"
 echo
 
+if [ "$BRANCH" == 'master' ]; then
+  echo "Skipping Apex iso verify for master branch"
+  exit 0
+fi
+
 # Must be RPMs/ISO
 echo "Downloading latest properties file"
 
index 3112c9d..3f15847 100755 (executable)
@@ -7,6 +7,8 @@ echo "Starting unit tests for Apex..."
 echo "---------------------------------------------------------------------------------------"
 echo
 
+PATH=$PATH:/usr/sbin
+
 
 pushd build/ > /dev/null
 for pkg in yamllint rpmlint iproute epel-release python34-devel python34-nose python34-PyYAML python-pep8 python34-mock python34-pip; do
index 4037d25..8743368 100755 (executable)
@@ -109,8 +109,8 @@ fi
 if [ "$ARTIFACT_TYPE" == 'snapshot' ]; then
   uploadsnap
 elif [ "$ARTIFACT_TYPE" == 'iso' ]; then
-  if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
-    echo "Skipping artifact upload for ${ARTIFACT_TYPE} due to dev build"
+  if [[ "$ARTIFACT_VERSION" =~ dev || "$BRANCH" == 'master' ]]; then
+    echo "Skipping ISO artifact upload for ${ARTIFACT_TYPE} due to dev/master build"
     exit 0
   fi
   if [[ -n "$SIGN_ARTIFACT" && "$SIGN_ARTIFACT" == "true" ]]; then
@@ -119,20 +119,28 @@ elif [ "$ARTIFACT_TYPE" == 'iso' ]; then
   uploadiso
 elif [ "$ARTIFACT_TYPE" == 'rpm' ]; then
   if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
-    echo "dev build detected, will upload image tarball"
-    ARTIFACT_TYPE=tarball
-    uploadimages
+    if [ "$BRANCH" == 'master' ]; then
+      echo "will not upload artifacts, master uses upstream"
+      ARTIFACT_TYPE=none
+    else
+      echo "dev build detected, will upload image tarball"
+      ARTIFACT_TYPE=tarball
+      uploadimages
+    fi
   else
     RPM_INSTALL_PATH=$BUILD_DIRECTORY/noarch
+    # RPM URL should be python package for master, and is only package we need
     RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
-    VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//')
-    RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-undercloud-${VERSION_EXTENSION}"
-    RPM_LIST+=" ${RPM_INSTALL_PATH}/python34-opnfv-apex-${VERSION_EXTENSION}"
     SRPM_INSTALL_PATH=$BUILD_DIRECTORY
     SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL)
-    VERSION_EXTENSION=$(echo $(basename $OPNFV_SRPM_URL) | sed 's/opnfv-apex-//')
-    SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-undercloud-${VERSION_EXTENSION}"
-    SRPM_LIST+=" ${SRPM_INSTALL_PATH}/python34-opnfv-apex-${VERSION_EXTENSION}"
+    if [ "$BRANCH" != 'master' ]; then
+      VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//')
+      RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-undercloud-${VERSION_EXTENSION}"
+      RPM_LIST+=" ${RPM_INSTALL_PATH}/python34-opnfv-apex-${VERSION_EXTENSION}"
+      VERSION_EXTENSION=$(echo $(basename $OPNFV_SRPM_URL) | sed 's/opnfv-apex-//')
+      SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-undercloud-${VERSION_EXTENSION}"
+      SRPM_LIST+=" ${SRPM_INSTALL_PATH}/python34-opnfv-apex-${VERSION_EXTENSION}"
+    fi
 
     if [[ -n "$SIGN_ARTIFACT" && "$SIGN_ARTIFACT" == "true" ]]; then
       signrpm
index 79b3588..7dbd670 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)-.*$') > detected_scenario
+      # 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 80ba50b..587a063 100644 (file)
@@ -37,7 +37,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: true
+          disable_daily: false
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           <<: *fraser
       - 'os-nosdn-bar-noha':
           <<: *fraser
-      - 'os-nosdn-nofeature-ha-ipv6':
-          <<: *fraser
       - 'os-nosdn-ovs_dpdk-noha':
           <<: *fraser
       - 'os-nosdn-ovs_dpdk-ha':
           <<: *fraser
-      - 'os-nosdn-kvm_ovs_dpdk-noha':
-          <<: *fraser
-      - 'os-nosdn-kvm_ovs_dpdk-ha':
-          <<: *fraser
       - 'os-odl-sfc-noha':
           <<: *fraser
       - 'os-odl-sfc-ha':
           <<: *danube
       - 'os-ovn-nofeature-noha':
           <<: *danube
-      - 'os-nosdn-nofeature-noha':
-          <<: *master
-      - 'os-nosdn-nofeature-ha':
-          <<: *master
-      - 'os-odl-nofeature-ha':
-          <<: *master
-      - 'os-odl-nofeature-noha':
-          <<: *master
-      - 'os-odl-bgpvpn-ha':
-          <<: *master
-      - 'os-odl-bgpvpn-noha':
-          <<: *master
-      - 'os-odl-sriov-noha':
-          <<: *master
-      - 'os-odl-ovs_offload-noha':
-          <<: *master
-      - 'os-ovn-nofeature-noha':
-          <<: *master
-      - 'os-nosdn-fdio-noha':
-          <<: *master
-      - 'os-nosdn-fdio-ha':
-          <<: *master
-      - 'os-nosdn-bar-ha':
+      - 'os-odl-master_upstream-noha':
           <<: *master
-      - 'os-nosdn-bar-noha':
-          <<: *master
-      - 'os-nosdn-ovs_dpdk-noha':
-          <<: *master
-      - 'os-nosdn-ovs_dpdk-ha':
-          <<: *master
-      - 'os-odl-ovs_dpdk-noha':
-          <<: *master
-      - 'os-odl-ovs_dpdk-ha':
-          <<: *master
-      - 'os-odl-sfc-noha':
-          <<: *master
-      - 'os-odl-sfc-ha':
-          <<: *master
-      - 'os-nosdn-calipso-noha':
+      - 'os-odl-queens_upstream-noha':
           <<: *master
       - 'os-nosdn-nofeature-noha':
           <<: *euphrates
       - multijob:
           name: 'Baremetal Deploy'
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'apex-deploy-baremetal-{scenario_stream}'
               node-parameters: true
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-fetch-logs-{scenario_stream}'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+              node-parameters: true
+              kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
       - multijob:
       - multijob:
           name: apex-fetch-logs
           projects:
-            - name: 'apex-fetch-logs'
+            - name: 'apex-fetch-logs-{scenario_stream}'
               current-parameters: true
               predefined-parameters: |
                 GERRIT_BRANCH=$GERRIT_BRANCH
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
             - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-fraser'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
             - name: 'apex-os-odl-sfc-noha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
           name: Baremetal Deploy and Test Phase
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-os-nosdn-nofeature-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-nofeature-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-nofeature-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-bgpvpn-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-bgpvpn-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-sriov-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-ovs_offload-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-ovn-nofeature-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-fdio-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-bar-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-bar-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-ovs_dpdk-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-ovs_dpdk-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-sfc-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-sfc-ha-baremetal-master'
+            - name: 'apex-os-odl-master_upstream-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-calipso-noha-baremetal-master'
+            - name: 'apex-os-odl-queens_upstream-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
index 29a93b4..4620bbc 100644 (file)
@@ -37,7 +37,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: true
+          disable_daily: false
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
       - multijob:
           name: 'Baremetal Deploy'
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'apex-deploy-baremetal-{scenario_stream}'
               node-parameters: true
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-fetch-logs-{scenario_stream}'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+              node-parameters: true
+              kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
       - multijob:
       - multijob:
           name: apex-fetch-logs
           projects:
-            - name: 'apex-fetch-logs'
+            - name: 'apex-fetch-logs-{scenario_stream}'
               current-parameters: true
               predefined-parameters: |
                 GERRIT_BRANCH=$GERRIT_BRANCH
index 58f1c64..2650eaf 100644 (file)
@@ -1,24 +1,6 @@
 master:
-  - 'os-nosdn-nofeature-noha'
-  - 'os-nosdn-nofeature-ha'
-  - 'os-odl-nofeature-ha'
   - 'os-odl-nofeature-noha'
-  - 'os-odl-bgpvpn-ha'
-  - 'os-odl-bgpvpn-noha'
-  - 'os-odl-sriov-noha'
-  - 'os-odl-ovs_offload-noha'
-  - 'os-ovn-nofeature-noha'
-  - 'os-nosdn-fdio-noha'
-  - 'os-nosdn-fdio-ha'
-  - 'os-nosdn-bar-ha'
-  - 'os-nosdn-bar-noha'
-  - 'os-nosdn-ovs_dpdk-noha'
-  - 'os-nosdn-ovs_dpdk-ha'
-  - 'os-odl-ovs_dpdk-noha'
-  - 'os-odl-ovs_dpdk-ha'
-  - 'os-odl-sfc-noha'
-  - 'os-odl-sfc-ha'
-  - 'os-nosdn-calipso-noha'
+  - 'os-odl-queens-noha'
 fraser:
   - 'os-nosdn-nofeature-noha'
   - 'os-nosdn-nofeature-ha'
@@ -30,11 +12,8 @@ fraser:
   - 'os-nosdn-fdio-ha'
   - 'os-nosdn-bar-ha'
   - 'os-nosdn-bar-noha'
-  - 'os-nosdn-nofeature-ha-ipv6'
   - 'os-nosdn-ovs_dpdk-noha'
   - 'os-nosdn-ovs_dpdk-ha'
-  - 'os-nosdn-kvm_ovs_dpdk-noha'
-  - 'os-nosdn-kvm_ovs_dpdk-ha'
   - 'os-odl-sfc-noha'
   - 'os-odl-sfc-ha'
   - 'os-nosdn-calipso-noha'
index c74e3c8..5bf64c1 100644 (file)
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                MON: true
-                WED: true
-                FRI: true
+                SAT: true
               use-build-time: true
           steps:
             - trigger-builds:
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                TUES: true
+                SUN: true
               use-build-time: true
           steps:
             - trigger-builds:
           gs-pathname: '{gs-pathname}'
       - '{slave-label}-defaults':
           installer: '{installer}'
+      - testapi-parameter
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
+      - track-begin-timestamp
       - shell:
           !include-raw-escape: ../fuel/fuel-deploy.sh
 
       - email:
           recipients: armband@enea.com
       - email-jenkins-admins-on-failure
+      - report-provision-result
 
 ########################
 # trigger macros
index d296738..9217620 100644 (file)
@@ -18,7 +18,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
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 2d9ecef..6701e7c 100644 (file)
@@ -11,8 +11,9 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
           disabled: false
 
 - job-template:
index 56aee17..cd38313 100644 (file)
@@ -34,7 +34,6 @@
       - dovetail
       - dpacc
       - enfv
-      - fastpathmetrics
       - fds
       - fuel
       - functest
       - kvmfornfv
       - models
       - moon
-      - multisite
       - netready
       - nfvbench
-      - octopus
       - onosfw
-      - openretriever
       - opera
       - opnfvdocs
       - orchestra
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|escalator|fds|fuel|functest|octopus|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|lsoapi|models|moon|multisite|netready'
+              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
index 9744688..31eed8f 100644 (file)
@@ -84,7 +84,7 @@
       - git-scm
 
     triggers:
-      - timed: '0 11 * * *'
+      - timed: '0 8 * * *'
 
     wrappers:
       - fix-workspace-permissions
       - git-scm
 
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 9 * * *'
 
     builders:
       - shell: |
index 0d5f92c..88fb026 100644 (file)
               label: '{scenario}'
           steps:
             - trigger-builds:
-                - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 5 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
     triggers:
 - trigger:
     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 7 2-30/2 * *'
 
 # ---------------------
 # noha-baremetal-fraser
index 13830ce..dc935f0 100644 (file)
@@ -20,7 +20,7 @@
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
index 444b173..c357ff6 100644 (file)
           gs-pathname: ''
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'ocata'
+          openstack-version: 'pike'
           branch-type: 'master'
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'ocata'
+          openstack-version: 'pike'
           branch-type: 'master'
 
     distro:
index 3246243..5f5bc86 100644 (file)
@@ -4,6 +4,11 @@
     name: 'container4nfv-arm64'
     project: 'container4nfv'
     installer: 'compass'
+    stream:
+      - master:
+          branch: master
+      - fraser:
+          branch: stable/fraser
     scenario:
       - 'k8-multus-nofeature-noha':
           disabled: false
       - baremetal:
           slave-label: compass-baremetal-arm
     jobs:
-      - 'container4nfv-{scenario}-{pod}-daily-master'
+      - 'container4nfv-{scenario}-{pod}-daily-{stream}'
 
 
 - job-template:
-    name: 'container4nfv-{scenario}-{pod}-daily-master'
+    name: 'container4nfv-{scenario}-{pod}-daily-{stream}'
     disabled: '{obj:disabled}'
     concurrent: false
     node: '{slave-label}'
       - git:
           url: https://gerrit.opnfv.org/gerrit/compass4nfv
           branches:
-            - origin/master
+            - '{branch}'
           basedir: compass4nfv
           wipe-workspace: true
 
     triggers:
-      - 'trigger-{scenario}-{pod}'
+      - 'trigger-{scenario}-{pod}-{stream}'
 
     wrappers:
       - timeout:
 
 
 - trigger:
-    name: 'trigger-k8-multus-nofeature-noha-virtual'
+    name: 'trigger-k8-multus-nofeature-noha-virtual-master'
     triggers:
       - timed: '0 12 * * *'
 - trigger:
-    name: 'trigger-k8-sriov-nofeature-noha-virtual'
+    name: 'trigger-k8-sriov-nofeature-noha-virtual-master'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 15 * * *'
 
 - trigger:
-    name: 'trigger-k8-multus-nofeature-noha-baremetal'
+    name: 'trigger-k8-multus-nofeature-noha-virtual-fraser'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 18 * * *'
 - trigger:
-    name: 'trigger-k8-sriov-nofeature-noha-baremetal'
+    name: 'trigger-k8-sriov-nofeature-noha-virtual-fraser'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 21 * * *'
+
+
+- trigger:
+    name: 'trigger-k8-multus-nofeature-noha-baremetal-master'
+    triggers:
+      - timed: '0 12 * * *'
+- trigger:
+    name: 'trigger-k8-sriov-nofeature-noha-baremetal-master'
+    triggers:
+      - timed: '0 15 * * *'
+
+- trigger:
+    name: 'trigger-k8-multus-nofeature-noha-baremetal-fraser'
+    triggers:
+      - timed: '0 18 * * *'
+- trigger:
+    name: 'trigger-k8-sriov-nofeature-noha-baremetal-fraser'
+    triggers:
+      - timed: '0 21 * * *'
index 1ab50ae..194a1a9 100644 (file)
@@ -18,7 +18,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -36,7 +36,8 @@
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - 'opnfv-build-ubuntu-defaults'
 
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - node:
           name: SLAVE_NAME
index 9b8b271..6ed345e 100644 (file)
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
+    fraser: &fraser
+      stream: fraser
+      branch: '{stream}'
+      gs-pathname: 'stable/{stream}'
+      docker-tag: 'stable'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
index 2eb27a6..1769bb4 100644 (file)
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
-      # - baremetal:
-      #     slave-label: zte-pod3
-      #     <<: *master
+      - zte-pod3:
+          slave-label: zte-pod3
+          <<: *master
+      - zte-pod3:
+          slave-label: zte-pod3
+          <<: *fraser
       - zte-pod9:
           slave-label: zte-pod9
           <<: *master
       - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
 
     builders:
       - description-setter:
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: 'baremetal'
-              label: '{pod}'
-            - condition-kind: regex-match
-              regex: 'master'
-              label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'yardstick-daisy-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                    UPSTREAM_JOB_NAME=$JOB_NAME
-                    UPSTREAM_BUILD_ID=$BUILD_ID
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'yardstick-daisy-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
+              UPSTREAM_JOB_NAME=$JOB_NAME
+              UPSTREAM_BUILD_ID=$BUILD_ID
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
 
 - job-template:
     name: '{project}-deploy-{pod}-daily-{stream}'
           blocking-jobs:
             - 'daisy-kolla-build-.*'
             - '{installer}-(build|deploy|test)-daily-(fraser|master)'
-            - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+            - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
           block-level: 'NODE'
 
     parameters:
       - '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'
     triggers:
       - timed: ''
 
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against master branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against fraser branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: '0 16,22 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+
 # ----------------------------------------------
 # ZTE POD9 Triggers running against master branch
 # ----------------------------------------------
index 3ea74a9..cb0dea1 100644 (file)
           use-build-blocker: true
           blocking-jobs:
             - '{installer}-daily-(build|deploy|test)-(fraser|master)'
-            - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+            - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
           block-level: 'NODE'
 
     scm:
index eba22dc..3985356 100644 (file)
           docker-tag: 'stable'
           disabled: false
 
+    # feature projects' tests are not triggered by functest
+    # doctor verify Pods need to deploy with these scenario
     installer:
-      - 'apex'
-      - 'fuel'
-      - 'daisy'
+      - 'apex':
+          scenario: 'os-nosdn-kvm-ha'
+      - 'fuel':
+          scenario: 'os-nosdn-ovs-ha'
+      - 'daisy':
+          scenario: 'os-nosdn-ovs_dpdk-noha'
 
     arch:
       - 'x86_64'
         arch: 'aarch64'
 
     jobs:
-      - 'doctor-verify-{stream}'
-      - 'doctor-verify-unit-test-{stream}'
       - 'doctor-verify-{inspector}-{stream}'
       - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
 
 - job-template:
-    name: 'doctor-verify-{stream}'
+    name: 'doctor-verify-{inspector}-{stream}'
     disabled: '{obj:disabled}'
     project-type: 'multijob'
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-    scm:
-      - git-scm-gerrit
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'doctor_tests/**'
-
-    builders:
-      - shell: |
-         #!/bin/bash
-         # we do nothing here as the main stuff will be done
-         # in phase jobs
-         echo "Triggering phase jobs!"
-      - multijob:
-          name: 'doctor-build-and-unittest'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-verify-unit-test-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              kill-phase-on: FAILURE
-              current-parameters: true
-              git-revision: true
-
-- job-template:
-    name: 'doctor-verify-unit-test-{stream}'
-    disabled: '{obj:disabled}'
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 60
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-    scm:
-      - git-scm-gerrit
-    builders:
-      - 'doctor-verify-unit-test-builders-macro'
-    publishers:
-      - 'doctor-verify-unit-test-publishers-macro'
-
-- job-template:
-    name: 'doctor-verify-{inspector}-{stream}'
-    disabled: '{obj:disabled}'
-    project-type: 'multijob'
+      - 'doctor-slave-parameter'
     scm:
       - git-scm-gerrit
     triggers:
          # in phase jobs
          echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-apex-inspector'
+          name: 'doctor-verify'
           execution-type: PARALLEL
           projects:
             - name: 'doctor-verify-apex-{inspector}-x86_64-{stream}'
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-fuel-inspector'
-          execution-type: PARALLEL
-          projects:
             - name: 'doctor-verify-fuel-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-fuel-inspector'
-          execution-type: PARALLEL
-          projects:
             - name: 'doctor-verify-fuel-{inspector}-aarch64-{stream}'
               predefined-parameters: |
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-daisy-inspector'
-          execution-type: PARALLEL
-          projects:
             - name: 'doctor-verify-daisy-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
 
 - job-template:
           branch: '{branch}'
       - '{installer}-defaults'
       - 'doctor-slave-parameter'
-      - 'doctor-parameter'
+      - 'doctor-parameter':
+          docker-tag: '{docker-tag}'
+          scenario: '{scenario}'
       - 'doctor-functest-parameter'
     scm:
       - git-scm-gerrit
           description: 'Remove downloaded docker images (opnfv/functest:*)'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+          default: '{scenario}'
           description: 'Scenario to deploy and test'
 
 - parameter:
 # builder macros
 # -------------------------------
 
-- builder:
-    name: 'doctor-verify-unit-test-builders-macro'
-    builders:
-      - shell: "tox -e pep8"
-
 - builder:
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
           artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
       - email-jenkins-admins-on-failure
 
-- publisher:
-    name: 'doctor-verify-unit-test-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
-      - archive:
-          artifacts: '.tox/'
-
 
 #####################################
 # trigger macros
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 5e5b6e1..a95617a 100644 (file)
@@ -20,8 +20,8 @@
       dovetail-branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       dovetail-branch: master
       gs-pathname: '/{stream}'
           slave-label: fuel-baremetal
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
           slave-label: compass-baremetal
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #    Installers not using labels
       #            CI PODs
           slave-label: apex-virtual-master
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
           slave-label: apex-baremetal-master
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
           slave-label: armband-baremetal
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
           slave-label: zte-pod1
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - zte-pod3:
           slave-label: zte-pod3
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - huawei-pod4:
           slave-label: huawei-pod4
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - huawei-pod7:
           slave-label: huawei-pod7
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
 
     # -------------------------------
     testsuite:
index d011283..a5148cd 100755 (executable)
@@ -213,7 +213,7 @@ if [[ ! -f ${ubuntu_image} ]]; then
 fi
 sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES}
 
-# functest needs to download this image first before running
+# yardstick and bottlenecks need to download this image first before running
 cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img
 if [[ ! -f ${cirros_image} ]]; then
     echo "Download image cirros-0.3.5-x86_64-disk.img ..."
@@ -221,6 +221,14 @@ if [[ ! -f ${cirros_image} ]]; then
 fi
 sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
 
+# functest needs to download this image first before running
+cirros_image=${image_path}/cirros-0.4.0-x86_64-disk.img
+if [[ ! -f ${cirros_image} ]]; then
+    echo "Download image cirros-0.4.0-x86_64-disk.img ..."
+    wget -q -nc http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P ${image_path}
+fi
+sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
+
 # snaps_smoke test case needs to download this image first before running
 ubuntu14_image=${image_path}/ubuntu-14.04-server-cloudimg-amd64-disk1.img
 if [[ ! -f ${ubuntu14_image} ]]; then
@@ -315,9 +323,9 @@ docker exec $container_id ${run_cmd}
 sudo cp -r ${DOVETAIL_HOME}/results ./
 # To make sure the file owner is the current user, for the copied results files in the above line
 # if not, there will be error when next time to wipe workspace
-CURRENT_USER=${SUDO_USER:-$USER}
-PRIMARY_GROUP=$(id -gn $CURRENT_USER)
-sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
+CURRENT_USER=${SUDO_USER:-$USER}
+PRIMARY_GROUP=$(id -gn $CURRENT_USER)
+sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
 
 #remove useless files to save disk space
 sudo rm -rf ./results/workspace
index 9c7b5da..7110dae 100644 (file)
           gs-pathname: '{gs-pathname}'
       - '{slave-label}-defaults':
           installer: '{installer}'
+      - testapi-parameter
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
+      - track-begin-timestamp
       - shell:
           !include-raw-escape: ./fuel-download-artifact.sh
       - shell:
       - email:
           recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
       - email-jenkins-admins-on-failure
+      - report-provision-result
 
 - job-template:
     name: 'fuel-collect-logs-{pod}-daily-{stream}'
index 459d0d1..aca625d 100644 (file)
           gs-pathname: '{gs-pathname}'
       - '{slave-label}-defaults':
           installer: '{installer}'
+      - testapi-parameter
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
+      - track-begin-timestamp
       - shell:
           !include-raw-escape: ./fuel-deploy.sh
 
       - email:
           recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
       - email-jenkins-admins-on-failure
+      - report-provision-result
 
 ########################
 # trigger macros
index 72b94bd..440b00a 100755 (executable)
@@ -28,13 +28,8 @@ check_os_deployment() {
 
 run_tiers() {
     tiers=$1
-    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
-        cmd_opt="prepare_env start && run_tests -r -t all"
-        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all"
-    else
-        cmd_opt="run_tests -r -t all"
-        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
-    fi
+    cmd_opt="run_tests -r -t all"
+    [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
 
@@ -58,11 +53,7 @@ run_tiers() {
 
 run_test() {
     test_name=$1
-    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
-        cmd_opt="prepare_env start && run_tests -t ${test_name}"
-    else
-        cmd_opt="run_tests -t ${test_name}"
-    fi
+    cmd_opt="run_tests -t ${test_name}"
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
     # Determine which Functest image should be used for the test case
@@ -115,11 +106,7 @@ elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
     cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
 fi
 
-if [[ ${BRANCH} == "stable/euphrates" ]]; then
-    rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds"
-else
-    rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
-fi
+rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
 
 # 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
index b93a56b..ae226b6 100644 (file)
       stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-    euphrates: &euphrates
-      stream: euphrates
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
       - baremetal:
           slave-label: joid-baremetal
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
           installer: apex
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
       - baremetal:
           slave-label: daisy-baremetal
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: daisy-virtual
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       # netvirt 3rd party ci
       - virtual:
           slave-label: odl-netvirt-virtual
       - zte-pod1:
           slave-label: '{pod}'
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod9:
           slave-label: '{pod}'
           installer: daisy
           <<: *master
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *fraser
     # -------------------------------
     # PODs for verify jobs triggered by each patch upload
     #   - ool-virtual1:
index 9017354..419c4e0 100755 (executable)
@@ -42,17 +42,23 @@ DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*
 
 set +e
 
-FUNCTEST_IMAGE=opnfv/functest-kubernetes:${DOCKER_TAG}
-echo "Pulling Docker image ${FUNCTEST_IMAGE} ..."
-docker pull ${FUNCTEST_IMAGE}>/dev/null
-cmd_opt="run_tests -r -t all"
-cmd="docker run --rm ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
-echo "Running Functest k8s test cases, CMD: ${cmd}"
-eval ${cmd}
-ret_value=$?
-
 ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
 echo 0 > ${ret_val_file}
-if [ ${ret_value} != 0 ]; then
-  echo ${ret_value} > ${ret_val_file}
-fi
+
+FUNCTEST_IMAGES="\
+opnfv/functest-kubernetes-healthcheck:${DOCKER_TAG} \
+opnfv/functest-kubernetes-smoke:${DOCKER_TAG} \
+opnfv/functest-kubernetes-features:${DOCKER_TAG}"
+cmd_opt="run_tests -r -t all"
+
+for image in ${FUNCTEST_IMAGES}; do
+    echo "Pulling Docker image ${image} ..."
+    docker pull "${image}" >/dev/null
+    cmd="docker run --rm ${envs} ${volumes} ${image} /bin/bash -c '${cmd_opt}'"
+    echo "Running Functest k8s test cases, CMD: ${cmd}"
+    eval ${cmd}
+    ret_value=$?
+    if [ ${ret_value} != 0 ]; then
+        echo ${ret_value} > ${ret_val_file}
+    fi
+done
index de1895d..2085251 100644 (file)
@@ -23,6 +23,9 @@
     # yamllint disable rule:key-duplicates
     image:
       - 'core'
+      - 'healthcheck'
+      - 'smoke'
+      - 'features'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
           projects:
             - name: 'functest-kubernetes-core-docker-build-amd64-{stream}'
               <<: *build-job-settings
+      - multijob:
+          name: 'build functest-kubernetes-[healthcheck,features] image'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-kubernetes-healthcheck-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-kubernetes-features-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+      - multijob:
+          name: 'build functest-kubernetes-smoke image'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}'
+              <<: *build-job-settings
 
     publishers:
       - 'functest-kubernetes-amd64-recipients'
     builders:
       - shell: |
           #!/bin/bash -ex
-          case "{stream}" in
-          "master")
-              tag="latest" ;;
-          *)
-              tag="{stream}" ;;
-          esac
-          (cd docker && sudo docker build --pull=true --no-cache --force-rm=true \
-              -t "$REPO/functest-kubernetes:$tag" .)
-          sudo docker push "$REPO/functest-kubernetes:$tag"
-          sudo docker rmi "$REPO/functest-kubernetes:$tag"
+          sudo amd64_dirs=docker/{image} bash ./build.sh
           exit $?
 
 # parameter macro
index 5599906..7f8dd8d 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
index b3ab3ca..9a12305 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
     builders:
       - shell: |
           cd $WORKSPACE && tox -edocs
-            wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs"
+            wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/build" "docs"
 ################################
 # job publishers
 ################################
index d87ac2f..c88fa00 100644 (file)
       gs-pathname: '/{stream}'
       docker-tag: '{stream}'
       disabled: false
-    euphrates: &euphrates
-      stream: euphrates
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-      docker-tag: '{stream}'
-      disabled: false
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
     # -------------------------------
     jobs:
       - 'functest-{installer}-{pod}-weekly-{stream}'
index dc26344..251c395 100644 (file)
@@ -12,6 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          disabled: false
 
     arch_tag:
       - 'amd64':
index bf08775..e109387 100644 (file)
@@ -18,7 +18,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
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..b7335fa 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'
           branches:
             - 'origin/$BRANCH'
           timeout: 15
+          per-build-tag: false
+          shallow-clone: false
+          use-author: false
+          ignore-notify: false
+          wipe-workspace: true
+          prune: false
 
 - scm:
     name: git-scm-gerrit
           recipients: >
             JBuchanan@advaoptical.com
 
-- publisher:
-    name: 'email-escalator-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            kong.wei2@zte.com.cn
-
-- publisher:
-    name: 'email-fastpathmetrics-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            maryam.tahhan@intel.com
-
 - publisher:
     name: 'email-fds-ptl'
     publishers:
           recipients: >
             ruan.he@orange.com
 
-- publisher:
-    name: 'email-multisite-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            joehuang@huawei.com
-
 - publisher:
     name: 'email-netready-ptl'
     publishers:
           recipients: >
             ahothan@cisco.com
 
-- publisher:
-    name: 'email-octopus-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            ulrich.kleber@huawei.com
-
 - publisher:
     name: 'email-onosfw-ptl'
     publishers:
           recipients: >
             su.wei@huawei.com
 
-- publisher:
-    name: 'email-openretriever-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            jiaxuan@chinamobile.com
-
 - publisher:
     name: 'email-opera-ptl'
     publishers:
index 628c13f..9d8bed4 100644 (file)
 - parameter:
     name: 'doctor-slave-parameter'
     parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - 'doctor-apex-x86_64'
-            - 'doctor-fuel-x86_64'
-            - 'doctor-fuel-aarch64'
-            - 'doctor-joid-x86_64'
-            - 'doctor-daisy-x86_64'
-            - 'not-specified'
-          default-slaves:
-            - 'not-specified'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           default: /root/.ssh/id_rsa
           description: 'SSH key to be used'
 
-- parameter:
-    name: 'multisite-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'multisite-virtual'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'ericsson-virtual5-defaults'
     parameters:
index 1e92fbf..2719c72 100644 (file)
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: '5 23 * * *'
+      - timed: ''  # Disabled as there is no branch for orchestra
 # os-nosdn-openbaton-ha trigger - branch: master
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
index a01e9aa..44e85d2 100644 (file)
       - master:
           branch: '{stream}'
           gs-pathname: ''
-          disabled: false
           docker-tag: 'latest'
+          disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          docker-tag: 'stable'
+          disabled: false
 
 - job-template:
     name: 'nfvbench-build-{stream}'
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
deleted file mode 100644 (file)
index a04d7f1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-################################
-# job configuration for Octopus
-################################
-- project:
-    name: octopus
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'
index 28f9354..ece8569 100644 (file)
@@ -8,6 +8,8 @@
     stream:
       - master:
           branch: 'master'
+      - fraser:
+          branch: 'stable/{stream}'
       - danube:
           branch: 'stable/{stream}'
       - euphrates:
index 908ddba..5f08f69 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
@@ -87,7 +91,8 @@
       - string:
           name: GS_URL
           default: '$GS_BASE{gs-pathname}'
-          description: "Directory where the build artifact will be located upon the completion of the build."
+          description: "Directory where the build artifact will be located upon\
+            \ the completion of the build."
 
     scm:
       - git-scm
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 8754419..574138f 100644 (file)
@@ -16,7 +16,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
deleted file mode 100644 (file)
index b686d95..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
-    name: prediction
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'
index b130912..4e79c05 100644 (file)
@@ -15,9 +15,9 @@
           disabled: false
 
     pod:
-      - zte-virtual6:
-          installer: fuel
-          pod: zte-virtual6
+      - zte-virtual5:
+          installer: apex
+          pod: zte-virtual5
 
 ################################
 ## job templates
index f20b321..0fc623c 100644 (file)
           pod: zte-virtual6
           sut: vnf
           <<: *master
+      - compute:
+          installer: apex
+          pod: zte-virtual5
+          sut: node
+          <<: *fraser
+      - storage:
+          installer: apex
+          pod: zte-virtual5
+          sut: ''
+          <<: *fraser
+      - compute:
+          installer: fuel
+          pod: zte-virtual6
+          sut: vnf
+          <<: *fraser
 
 
     # -------------------------------
index 9d79ea5..9066b41 100644 (file)
           <<: *storperf-arm-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *euphrates
+          <<: *fraser
           <<: *yardstick-arm-receivers
 
     # yamllint enable rule:key-duplicates
index 630a7ea..b7d1ce6 100644 (file)
           project: 'bottlenecks'
           <<: *master
           <<: *other-receivers
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'subservices/lb/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'subservices/proxy/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'subservices/server/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'cperf':
           project: 'cperf'
           <<: *master
           <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
-          <<: *euphrates
+          <<: *fraser
           <<: *other-receivers
       - 'qtip':
           project: 'qtip'
-          <<: *euphrates
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile.local'
+          <<: *fraser
           <<: *other-receivers
       - 'storperf-master':
           project: 'storperf'
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *euphrates
+          <<: *fraser
           <<: *other-receivers
       # projects with jobs for danube
       - 'dovetail':
           project: 'dovetail'
           <<: *danube
           <<: *other-receivers
-
+      # projects with jobs for fraser
+      - 'bottlenecks':
+          project: 'bottlenecks'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'subservices/lb/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'subservices/proxy/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'subservices/server/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
     # yamllint enable rule:key-duplicates
     jobs:
       - "{dockerrepo}-docker-build-push-{stream}"
index 80893de..aac8c31 100644 (file)
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'functest|functest-kubernetes|sdnvpn|qtip|daisy|sfc|escalator'
+              project-pattern: 'sdnvpn|qtip|daisy|sfc|escalator'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'armband|fuel|octopus|releng-anteater'
+              project-pattern: 'armband|fuel|releng-anteater'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
index fb3bab4..19fb4b5 100644 (file)
           default-slaves:
             - lf-build1
             - lf-build2
+            - ericsson-build4
           allowed-multiselect: true
           ignore-offline-nodes: true
       - project-parameter:
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 2fb7c21..920ecdc 100644 (file)
     # -------------------------------
     distro:
       - 'xenial':
-          disabled: false
+          disabled: true
           dib-os-release: 'xenial'
           dib-os-element: 'ubuntu-minimal'
           dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
       - 'centos7':
-          disabled: false
+          disabled: true
           dib-os-release: '7'
           dib-os-element: 'centos-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
       - 'opensuse423':
-          disabled: false
+          disabled: true
           dib-os-release: '42.3'
           dib-os-element: 'opensuse-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
index 9d524bc..c810212 100755 (executable)
@@ -27,6 +27,9 @@ set -o nounset
 set -o pipefail
 
 cd ~/bifrost
+# set path for XCI repository
+export XCI_PATH=~/bifrost/releng-xci
+
 # provision 3 VMs; xcimaster, controller, and compute
 ./scripts/bifrost-provision.sh | ts
 
index aa98e07..6d43c97 100755 (executable)
@@ -24,12 +24,6 @@ if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then
     exit 0
 fi
 
-# skip the healthcheck if the scenario is Kubernetes scenario
-if [[ "$DEPLOY_SCENARIO" =~ k8 ]]; then
-    echo "Skipping the healthcheck!"
-    exit 0
-fi
-
 # if the scenario is external, we need to wipe WORKSPACE to place releng-xci there since
 # the project where the scenario is coming from is cloned and the patch checked out to the
 # xci/scenarios/$DEPLOY_SCENARIO to be synched on clean VM
@@ -50,17 +44,30 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT
 fi
 
 # set XCI_VENV for ansible
-export XCI_VENV=/home/devuser/releng-xci/venv
+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; 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
+functest_exit=$?
+
+case ${DEPLOY_SCENARIO[0]} in
+    os-*)
+        FUNCTEST_LOG=/root/results/functest.log
+        ;;
+    k8-*)
+        FUNCTEST_LOG=/root/results/functest-kubernetes.log
+        ;;
+    *)
+        echo "Unable to determine the installer. Exiting!"
+        exit 1
+        ;;
+esac
+
 echo "Functest log"
 echo "---------------------------------------------------------------------------------"
-ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat /root/results/functest.log"
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat $FUNCTEST_LOG"
 echo "---------------------------------------------------------------------------------"
-# check the log to see if we have any error
-if ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "grep -q 'FAIL' /root/results/functest.log"; then
-    echo "Error: Functest failed!"
-    exit 1
-fi
+exit ${functest_exit}
index c3012cd..c28093d 100755 (executable)
@@ -7,7 +7,6 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-set -o errexit
 set -o pipefail
 
 #----------------------------------------------------------------------
@@ -96,23 +95,27 @@ function determine_generic_scenario() {
 
     # get the changeset
     cd $WORKSPACE
-    CHANGESET=$(git diff HEAD^..HEAD --name-only)
-    for CHANGED_FILE in $CHANGESET; do
-        case $CHANGED_FILE in
-            *k8-nosdn*|*kubespray*)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "k8-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature'
-                ;;
-            *os-odl*)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "os-odl-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-odl-nofeature'
-                ;;
-            *os-nosdn*|*osa*)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
+    SCENARIOS=$(git diff HEAD^..HEAD --name-only -- 'xci/scenarios' | cut -d "/" -f 3 | uniq)
+    # We need to set default scenario for changes that mess with installers
+    INSTALLERS=$(git diff HEAD^..HEAD --name-only -- 'xci/installer' | cut -d "/" -f 3 | uniq)
+    for CHANGED_SCENARIO in $SCENARIOS; do
+        DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO
+    done
+    for CHANGED_INSTALLER in $INSTALLERS; do
+        case $CHANGED_INSTALLER in
+            kubespray)
+                DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature'
                 ;;
+            # Default case (including OSA changes)
             *)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
+                DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
                 ;;
-            esac
+        esac
     done
+    # For all other changes, we only need to set a default scenario if it's not set already
+    if git diff HEAD^..HEAD --name-only | grep -q -v 'xci/installer\|xci/scenario'; then
+         [[ ${#DEPLOY_SCENARIO[@]} -eq 0 ]] && DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
+    fi
 
     # extract releng-xci sha
     XCI_SHA=$(cd $WORKSPACE && git rev-parse HEAD)
index 24c7f31..4df3f52 100644 (file)
@@ -15,8 +15,8 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '{stream}'
       docker-tag: 'stable'
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # fuel CI PODs
       - baremetal:
           slave-label: fuel-baremetal
           slave-label: fuel-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
           slave-label: armband-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
           slave-label: joid-baremetal
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
           slave-label: compass-baremetal
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
+      - baremetal:
+          slave-label: daisy-baremetal
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *fraser
       - virtual:
           slave-label: daisy-virtual
           installer: daisy
           slave-label: '{pod}'
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
+      - zte-pod3:
+          slave-label: '{pod}'
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *fraser
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *fraser
       - orange-pod2:
           slave-label: '{pod}'
           installer: joid
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-virtual-euphrates'
+    name: 'yardstick-params-apex-virtual-fraser'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-baremetal-euphrates'
+    name: 'yardstick-params-apex-baremetal-fraser'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND
           default: '-i 104.197.68.199:8086'
           description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-zte-pod9'
+    parameters:
+      - string:
+          name: YARDSTICK_DB_BACKEND
+          default: '-i 104.197.68.199:8086'
+          description: 'Arguments to use in order to choose the backend DB'
+
 - parameter:
     name: 'yardstick-params-orange-pod1'
     parameters:
index 63ce298..56e825e 100644 (file)
@@ -17,7 +17,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -87,7 +87,8 @@
       - string:
           name: GS_URL
           default: '$GS_BASE{gs-pathname}'
-          description: "Directory where the build artifact will be located upon the completion     of the build."
+          description: "Directory where the build artifact will be located upon\
+            \ the completion of the build."
 
     scm:
       - git-scm
           sudo apt-get -y clean && sudo apt-get -y autoremove
 
           echo "Configure RabbitMQ service"
-          service rabbitmq-server restart
-          rabbitmqctl start_app
-          if [ -z "$(rabbitmqctl list_users | grep yardstick)" ]; then
-            rabbitmqctl add_user yardstick yardstick
-            rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
+          sudo service rabbitmq-server restart
+          sudo rabbitmqctl start_app
+          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
+            sudo rabbitmqctl add_user yardstick yardstick
+            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
           fi
 
           echo "Running functional tests in Python 2.7 ..."
           sudo apt-get -y clean && sudo apt-get -y autoremove
 
           echo "Configure RabbitMQ service"
-          service rabbitmq-server restart
-          rabbitmqctl start_app
-          if [ -z "$(rabbitmqctl list_users | grep yardstick)" ]; then
-            rabbitmqctl add_user yardstick yardstick
-            rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
+          sudo service rabbitmq-server restart
+          sudo rabbitmqctl start_app
+          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
+            sudo rabbitmqctl add_user yardstick yardstick
+            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
           fi
 
           echo "Running functional tests in Python 3 ..."
index 70f34fa..c097d06 100644 (file)
@@ -12,6 +12,20 @@ project-type: installer
 release-model: stable
 upstream: https://wiki.openstack.org/wiki/TripleO
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      apex: 283bb98ae05b77979f00716d3c9cd3fff6af3651
+  - version: opnfv-6.0.0
+    location:
+      apex-tripleo-heat-templates: 7f1cc97bcd6f267b11a251de3204edf0e8ec79c0
+  - version: opnfv-6.0.0
+    location:
+      apex-puppet-tripleo: bebd15efe40498c272577c563bc113ec3849dcc6
+  - version: opnfv-6.0.0
+    location:
+      apex-os-net-config: e09d110d7b58d26424c28a128cdfd8c766636461
+
 branches:
   - name: stable/fraser
     location:
@@ -26,4 +40,4 @@ branches:
     location:
       apex-os-net-config: a301f9f0fff8b227562fdec639e66d76dafb4634
 
-release-notes: http://docs.opnfv.org/en/stable-euphrates/submodules/apex/docs/release/release-notes/release-notes.html
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/apex/docs/release/release-notes/release-notes.html
index ae2e44d..66afd10 100644 (file)
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: armband
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      armband: 2b0ac4026a3acf3b10ab2f4c416636d80ab559f0
+
 branches:
   - name: stable/fraser
     location:
       armband: 46040c0ab85aeba942b7ec7897b32243f859aac0
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/armband/docs/release/release-notes/release-notes.html
index fa2f58b..a86fabb 100644 (file)
@@ -3,7 +3,14 @@ project: auto
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      auto: 3a957a75f99686767d13f45d74b5ca8463559b7b
+
 branches:
   - name: stable/fraser
     location:
       auto: 5c8112dd4434e726da1325b0a699b9839f2f3d6b
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/auto/docs/release/release-notes/Auto-release-notes.html
index 1b35af7..91163b5 100644 (file)
@@ -3,6 +3,11 @@ project: availability
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      availability: c1ee3631b59009ff61450808e2bd33fe1d4b17f2
+
 branches:
   - name: stable/fraser
     location:
index 1ff9085..4ad1e9d 100644 (file)
@@ -3,6 +3,11 @@ project: barometer
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      barometer: 70a568ed8eed6f1a336f1fbe9bbc6900422e0c11
+
 branches:
   - name: stable/fraser
     location:
index 778e6ed..e72d0f6 100644 (file)
@@ -3,7 +3,15 @@ project: bottlenecks
 project-type: testing
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      bottlenecks: d76736440f852baed2e10a9b92c0557aabc041a6
+
 branches:
   - name: stable/fraser
     location:
       bottlenecks: d10c4644d44f707998c7f05dc72ec4913576b752
+
+release-notes:
+  http://docs.opnfv.org/en/stable-fraser/submodules/bottlenecks/docs/release/release-notes/release_notes.html
diff --git a/releases/fraser/calipso.yaml b/releases/fraser/calipso.yaml
new file mode 100644 (file)
index 0000000..e334910
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: calipso
+project-type: tools
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      calipso: 2e47d8704fa0fe56ced38ddb4fc94f111079bd82
index 91758cd..c731d2a 100644 (file)
@@ -3,7 +3,17 @@ project: clover
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      clover: aae68d3d9dbb8baa3cadef134e6e045ad79f1f57
+  - version: opnfv-6.0.1
+    location:
+      clover: be5f20bbe91f1ae3138a1e338eea5b45e89bda82
+
 branches:
   - name: stable/fraser
     location:
       clover: 67b7fb49e6ea6ac9c2547af263355e5f1aeade42
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/clover/docs/release/release-notes/release-notes.html
index 5b5c777..5c44336 100644 (file)
@@ -3,6 +3,14 @@ project: compass4nfv
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      compass4nfv: ab73374e424a679cc42b9812e6bd39a49fcea07d
+  - version: opnfv-6.0.0
+    location:
+      compass-containers: 15a7cbc925bed896c3c09a5635454c33dbffbadc
+
 branches:
   - name: stable/fraser
     location:
@@ -10,3 +18,7 @@ branches:
   - name: stable/fraser
     location:
       compass-containers: 15a7cbc925bed896c3c09a5635454c33dbffbadc
+
+# yamllint disable rule:line-length
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/compass4nfv/docs/release/release-notes/release-notes.html
+# yamllint enable rule:line-length
index f117f33..ed42ff0 100644 (file)
@@ -3,7 +3,15 @@ project: container4nfv
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      container4nfv: 38d0ffe507a137167ffdbac860de5c1a738e81a8
+
 branches:
   - name: stable/fraser
     location:
-      container4nfv: I6145b406450b0846999223f1e4e6783eb06bb0a9
+      container4nfv: 84ce45c8bf6e03f0373d9c46e0a8b7e0b3faa605
+
+release-notes:
+  http://docs.opnfv.org/en/stable-fraser/submodules/container4nfv/docs/release/release-notes/release-notes.html
index 78efc48..eddd87d 100644 (file)
@@ -3,6 +3,11 @@ project: daisy
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      daisy: 5bbbe44397d946b4d6fb3bdee6fba2c09131b698
+
 branches:
   - name: stable/fraser
     location:
index bc74a03..28cfe7b 100644 (file)
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 Nokia Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: doctor
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      doctor: cd500723c3b2de3655b2dc56ea9647f358183264
+
 branches:
   - name: stable/fraser
     location:
       doctor: 06980156b3eed6a6e456d3105c70b68386c1dfb7
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/doctor/docs/release/release-notes/releasenotes.html
index d0b7b19..226ba58 100644 (file)
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: fuel
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      fuel: d45841926790df8313912697d31753c120e2c4aa
+
 branches:
   - name: stable/fraser
     location:
       fuel: e083cf6350a227da161b07d2c68d9aa200611b32
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/fuel/docs/release/release-notes/release-notes.html
index 9956e96..d1837b8 100644 (file)
@@ -3,6 +3,14 @@ project: functest
 project-type: testing
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      functest: 7ba6ff1dfd4f5efb5c26a2606d53d625f3cae846
+  - version: opnfv-6.0.0
+    location:
+      functest-kubernetes: 770bd295031af2e12da3472b9ed2763bfdc4deaf
+
 branches:
   - name: stable/fraser
     location:
@@ -10,3 +18,8 @@ branches:
   - name: stable/fraser
     location:
       functest-kubernetes: 64d61b6a116d3b12e0f4f42c3240262ea6359fd8
+  - name: stable/fraser
+    location:
+      functest-xtesting: 4e4d8c583fe403db095e950c06030586f2aa929a
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/functest/docs/release/release-notes/index.html
index 853847c..2e92199 100644 (file)
@@ -1,8 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: ipv6
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      ipv6: 5b914695088b39aee3886bd60be4707b7a11a1e8
+
 branches:
   - name: stable/fraser
     location:
index c2ca0cd..6c230c3 100644 (file)
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: joid
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      joid: 266a4fd08bef19fca930cbbb1d45f5639b87d3c0
+
 branches:
   - name: stable/fraser
     location:
       joid: f1b6b2867e4e907cb84ea4670ad32f36bddcbf6c
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/joid/docs/release/release-notes/index.html
index e573a8b..9df1642 100644 (file)
@@ -3,7 +3,14 @@ project: nfvbench
 project-type: tools
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      nfvbench: c8402089ad8686a16ad08ce6c6e16a14c3144d64
+
 branches:
   - name: stable/fraser
     location:
       nfvbench: 34c00544f7f7dbfa49bbdcd83eca2936b60826c7
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/nfvbench/docs/release/release-notes/release-notes.html
diff --git a/releases/fraser/opnfvdocs.yaml b/releases/fraser/opnfvdocs.yaml
new file mode 100644 (file)
index 0000000..6e22328
--- /dev/null
@@ -0,0 +1,14 @@
+---
+project: opnfvdocs
+project-type: infra
+release-model: stable
+
+releases:
+  - version: opnfv-6.0.0
+    location:
+      opnfvdocs: 49538d56771c45d8d437ab00abaa1b52f97ac931
+
+branches:
+  - name: stable/fraser
+    location:
+      opnfvdocs: 3e010bda69a391f078e581319eccf8de1c4eccb7
index a04bd02..40eac0c 100644 (file)
@@ -2,8 +2,16 @@
 project: ovn4nfv
 project-type: feature
 release-model: stable
+upstream: https://docs.openstack.org/networking-ovn/latest/admin/ovn.html
+
+releases:
+  - version: opnfv-6.0.0
+    location:
+      ovn4nfv: 651acb603c2f4523905e4fe5134fd8a7940e1f3d
 
 branches:
   - name: stable/fraser
     location:
       ovn4nfv: 9623c07f59e059ed0b1cdc6fdfec9c7d9996d88d
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/ovn4nfv/docs/release/release-notes/release-notes.html
index a592945..ddcaa8f 100644 (file)
@@ -3,7 +3,18 @@ project: parser
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      parser: 320ca9e335797f2081f253df60a860e72b6cc9fb
+  - version: opnfv-6.0.1
+    location:
+      parser: 1f8a48db426982b26237188881cb4e5bd0011d35
+
 branches:
   - name: stable/fraser
     location:
       parser: cabfeecb3259c5e22488756d91b6f72d27c4c18a
+
+release-notes:
+  http://docs.opnfv.org/en/stable-fraser/submodules/parser/docs/release/release-notes/release-notes.html
index 575a53e..d564e70 100644 (file)
@@ -3,7 +3,15 @@ project: qtip
 project-type: testing
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      qtip: 873817cb48cb796bdbc4075299e92488cdee3f0e
+
 branches:
   - name: stable/fraser
     location:
       qtip: 357bffcd84ad61d1421eb8b63cdc549d69d365a7
+
+release-notes:
+  http://docs.opnfv.org/en/stable-fraser/submodules/qtip/docs/release/release-notes/release-notes.html
index c6eda5a..3c30f72 100644 (file)
@@ -3,7 +3,14 @@ project: samplevnf
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      samplevnf: 4685c59ec97927af559b4bf10001d0e07de34702
+
 branches:
   - name: stable/fraser
     location:
       samplevnf: b38082760fc411a8fc9e74f9c2d3a44ad633db5c
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/samplevnf/docs/release/release-notes/release-notes.html
index b0a3906..6fa8fa5 100644 (file)
@@ -3,7 +3,14 @@ project: sdnvpn
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      sdnvpn: be6cce375c0363f93fa6b1a099eb34fee75a6161
+
 branches:
   - name: stable/fraser
     location:
       sdnvpn: cc10bd492affb033b68d3b8f4cb1d8c9d554f995
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/sdnvpn/docs/release/release-notes/
index d423020..83850d7 100644 (file)
@@ -3,7 +3,14 @@ project: sfc
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      sfc: 084446656bf2794a11de56b782f589af1f703487
+
 branches:
   - name: stable/fraser
     location:
       sfc: 9dda531e8e9be93b930b89d45a395085fbcb61cc
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/sfc/docs/release/release-notes/
index 17318cc..c6c316c 100644 (file)
@@ -3,7 +3,14 @@ project: snaps
 project-type: tools
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      snaps: 4edc3d87392cf78c3f046217543fb76380413306
+
 branches:
   - name: stable/fraser
     location:
       snaps: 65aca3d6919a3d31fa360afa01baee5ebff1fe22
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/snaps/docs/release/release-notes/index.html
index 4700233..b4fd845 100644 (file)
@@ -3,7 +3,14 @@ project: stor4nfv
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      stor4nfv: fcedde93eb366867ed428d362e2cb8a6b7f28b3c
+
 branches:
   - name: stable/fraser
     location:
-      stor4nfv: I05dd6f833716e36d173f0b4e7f6a317d41f1a039
+      stor4nfv: fcedde93eb366867ed428d362e2cb8a6b7f28b3c
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/stor4nfv/docs/release/release-notes/index.html
index 06a37f6..1389c7a 100644 (file)
@@ -3,7 +3,14 @@ project: storperf
 project-type: testing
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      storperf: 2f8c1546ee5d79f9b4c46e960a74930cfe0fe50e
+
 branches:
   - name: stable/fraser
     location:
       storperf: ce8adafbccb4bc37930f95561fa24874906013ad
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/storperf/docs/release/release-notes/release-notes.html
index bcf60e7..95d8db6 100644 (file)
@@ -3,7 +3,15 @@ project: vswitchperf
 project-type: testing
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      vswitchperf: 998842df061caf3f90adf756c78667262525a6e0
+
 branches:
   - name: stable/fraser
     location:
       vswitchperf: a87a7696e58082b10fadef24176d53ebc67f3bd5
+
+release-notes:
+  http://docs.opnfv.org/en/stable-fraser/submodules/vswitchperf/docs/release/release-notes/release-notes.html
index 53bcfa6..59f6c10 100644 (file)
@@ -3,7 +3,14 @@ project: yardstick
 project-type: testing
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      yardstick: a4c8f2a99f56dd4c9fbac4021706aa9186d23ed8
+
 branches:
   - name: stable/fraser
     location:
       yardstick: f19016b39b828f648a66adc305cce17f5146e922
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/yardstick/docs/release/release-notes/release-notes.html