summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xjjb/apex/apex-build.sh52
-rwxr-xr-xjjb/apex/apex-deploy.sh32
-rwxr-xr-xjjb/apex/apex-download-artifact.sh43
-rwxr-xr-xjjb/apex/apex-iso-verify.sh5
-rwxr-xr-xjjb/apex/apex-upload-artifact.sh30
-rw-r--r--jjb/apex/scenarios.yaml.hidden4
-rw-r--r--jjb/armband/armband-verify-jobs.yml56
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml6
-rwxr-xr-xjjb/dovetail/dovetail-run.sh6
-rw-r--r--jjb/fuel/fuel-verify-jobs.yml54
-rw-r--r--jjb/releng/opnfv-docker.yml4
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh1
-rw-r--r--releases/fraser/apex.yaml14
-rw-r--r--releases/fraser/armband.yml15
-rw-r--r--releases/fraser/auto.yaml7
-rw-r--r--releases/fraser/availability.yaml5
-rw-r--r--releases/fraser/barometer.yaml5
-rw-r--r--releases/fraser/bottlenecks.yaml8
-rw-r--r--releases/fraser/clover.yaml10
-rw-r--r--releases/fraser/compass4nfv.yaml12
-rw-r--r--releases/fraser/container4nfv.yaml8
-rw-r--r--releases/fraser/daisy.yaml5
-rw-r--r--releases/fraser/doctor.yaml15
-rw-r--r--releases/fraser/fuel.yaml15
-rw-r--r--releases/fraser/functest.yaml10
-rw-r--r--releases/fraser/ipv6.yaml13
-rw-r--r--releases/fraser/joid.yaml15
-rw-r--r--releases/fraser/nfvbench.yaml7
-rw-r--r--releases/fraser/opnfvdocs.yaml5
-rw-r--r--releases/fraser/ovn4nfv.yaml8
-rw-r--r--releases/fraser/parser.yaml11
-rw-r--r--releases/fraser/qtip.yaml8
-rw-r--r--releases/fraser/samplevnf.yaml7
-rw-r--r--releases/fraser/sdnvpn.yaml7
-rw-r--r--releases/fraser/sfc.yaml7
-rw-r--r--releases/fraser/snaps.yaml7
-rw-r--r--releases/fraser/stor4nfv.yaml7
-rw-r--r--releases/fraser/storperf.yaml7
-rw-r--r--releases/fraser/vswitchperf.yaml8
-rw-r--r--releases/fraser/yardstick.yaml7
40 files changed, 412 insertions, 134 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh
index cf5999832..aabd20e30 100755
--- a/jjb/apex/apex-build.sh
+++ b/jjb/apex/apex-build.sh
@@ -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!"
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 958e4bf5e..35c2b8544 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -18,20 +18,26 @@ else
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
@@ -43,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
@@ -123,7 +137,7 @@ 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
diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh
index 6c0f8fe26..3efe1cbc7 100755
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -17,19 +17,20 @@ 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..."
@@ -45,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}
diff --git a/jjb/apex/apex-iso-verify.sh b/jjb/apex/apex-iso-verify.sh
index 4faeb607e..f34937619 100755
--- a/jjb/apex/apex-iso-verify.sh
+++ b/jjb/apex/apex-iso-verify.sh
@@ -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"
diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh
index 4037d25ad..8743368fb 100755
--- a/jjb/apex/apex-upload-artifact.sh
+++ b/jjb/apex/apex-upload-artifact.sh
@@ -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
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 91cd789c5..2650eafbb 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -1,6 +1,6 @@
master:
- - 'os-odl-master_upstream-noha'
- - 'os-odl-queens_upstream-noha'
+ - 'os-odl-nofeature-noha'
+ - 'os-odl-queens-noha'
fraser:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index c800872c7..08cf3c084 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -21,12 +21,8 @@
# patch verification phases
#####################################
phase:
- - 'basic':
- slave-label: 'armband-virtual'
- 'deploy-virtual':
slave-label: 'armband-virtual'
- - 'smoke-test':
- slave-label: 'armband-virtual'
#####################################
# jobs
#####################################
@@ -105,15 +101,18 @@
installer: '{installer}'
- '{installer}-defaults':
gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
builders:
- description-setter:
description: "Built on $NODE_NAME"
- multijob:
- name: basic
+ name: deploy-virtual
condition: SUCCESSFUL
projects:
- - name: 'armband-verify-basic-{stream}'
+ - name: 'armband-verify-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
BRANCH=$BRANCH
@@ -123,33 +122,39 @@
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
+
- multijob:
- name: deploy-virtual
+ name: smoke-test
condition: SUCCESSFUL
projects:
- - name: 'armband-verify-deploy-virtual-{stream}'
+ # Use Functest job definition from jjb/functest/functest-daily-jobs
+ - name: 'functest-fuel-armband-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=tier
+ FUNCTEST_TIER=healthcheck
+ # Should be in sync with fuel-deploy.sh default scenario
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- - multijob:
- name: smoke-test
- condition: SUCCESSFUL
- projects:
- - name: 'armband-verify-smoke-test-{stream}'
+ - name: 'functest-fuel-armband-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=testcase
+ FUNCTEST_SUITE_NAME=vping_ssh
+ # Should be in sync with fuel-deploy.sh default scenario
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- job-template:
@@ -170,7 +175,6 @@
use-build-blocker: true
blocking-jobs:
- 'armband-verify-deploy-.*'
- - 'armband-verify-test-.*'
block-level: 'NODE'
scm:
@@ -200,23 +204,7 @@
# builder macros
#####################################
- builder:
- name: 'armband-verify-basic-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"
-
-- builder:
name: 'armband-verify-deploy-virtual-macro'
builders:
- shell:
!include-raw: ../fuel/fuel-deploy.sh
-
-- builder:
- name: 'armband-verify-smoke-test-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 5f82803b6..88fb02605 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -276,7 +276,7 @@
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}
@@ -286,7 +286,7 @@
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}
@@ -296,7 +296,7 @@
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}
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index f74b10754..a5148cde9 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -323,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
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index d81b0ce92..bef6a5094 100644
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -21,12 +21,8 @@
# patch verification phases
#####################################
phase:
- - 'basic':
- slave-label: 'fuel-virtual'
- 'deploy-virtual':
slave-label: 'fuel-virtual'
- - 'smoke-test':
- slave-label: 'fuel-virtual'
#####################################
# jobs
#####################################
@@ -105,15 +101,18 @@
installer: '{installer}'
- '{installer}-defaults':
gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
builders:
- description-setter:
description: "Built on $NODE_NAME"
- multijob:
- name: basic
+ name: deploy-virtual
condition: SUCCESSFUL
projects:
- - name: 'fuel-verify-basic-{stream}'
+ - name: 'fuel-verify-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
BRANCH=$BRANCH
@@ -123,33 +122,37 @@
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
+
- multijob:
- name: deploy-virtual
+ name: smoke-test
condition: SUCCESSFUL
projects:
- - name: 'fuel-verify-deploy-virtual-{stream}'
+ # Use Functest job definition from jjb/functest/functest-daily-jobs
+ - name: 'functest-fuel-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=tier
+ FUNCTEST_TIER=healthcheck
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- - multijob:
- name: smoke-test
- condition: SUCCESSFUL
- projects:
- - name: 'fuel-verify-smoke-test-{stream}'
+ - name: 'functest-fuel-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=testcase
+ FUNCTEST_SUITE_NAME=vping_ssh
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- job-template:
@@ -170,7 +173,6 @@
use-build-blocker: true
blocking-jobs:
- 'fuel-verify-deploy-.*'
- - 'fuel-verify-test-.*'
block-level: 'NODE'
scm:
@@ -200,23 +202,7 @@
# builder macros
#####################################
- builder:
- name: 'fuel-verify-basic-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"
-
-- builder:
name: 'fuel-verify-deploy-virtual-macro'
builders:
- shell:
!include-raw: ./fuel-deploy.sh
-
-- builder:
- name: 'fuel-verify-smoke-test-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 0fe76f029..b7d1ce66f 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -219,6 +219,10 @@
<<: *danube
<<: *other-receivers
# projects with jobs for fraser
+ - 'bottlenecks':
+ project: 'bottlenecks'
+ <<: *fraser
+ <<: *other-receivers
- 'clover':
project: 'clover'
dockerdir: '.'
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 2fd68484e..783c64ee1 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -63,6 +63,7 @@ if [ "$(uname -m)" = 'aarch64' ]; then
fi
echo "Yardstick: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
+docker images
# map log directory
branch=${BRANCH##*/}
diff --git a/releases/fraser/apex.yaml b/releases/fraser/apex.yaml
index bbbb2ac38..c097d064a 100644
--- a/releases/fraser/apex.yaml
+++ b/releases/fraser/apex.yaml
@@ -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:
diff --git a/releases/fraser/armband.yml b/releases/fraser/armband.yml
index ae2e44db4..66afd10da 100644
--- a/releases/fraser/armband.yml
+++ b/releases/fraser/armband.yml
@@ -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
diff --git a/releases/fraser/auto.yaml b/releases/fraser/auto.yaml
index fa2f58ba7..a86fabbb3 100644
--- a/releases/fraser/auto.yaml
+++ b/releases/fraser/auto.yaml
@@ -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
diff --git a/releases/fraser/availability.yaml b/releases/fraser/availability.yaml
index 1b35af76c..91163b5a2 100644
--- a/releases/fraser/availability.yaml
+++ b/releases/fraser/availability.yaml
@@ -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:
diff --git a/releases/fraser/barometer.yaml b/releases/fraser/barometer.yaml
index 1ff908544..4ad1e9d63 100644
--- a/releases/fraser/barometer.yaml
+++ b/releases/fraser/barometer.yaml
@@ -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:
diff --git a/releases/fraser/bottlenecks.yaml b/releases/fraser/bottlenecks.yaml
index 778e6ed3b..e72d0f652 100644
--- a/releases/fraser/bottlenecks.yaml
+++ b/releases/fraser/bottlenecks.yaml
@@ -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/clover.yaml b/releases/fraser/clover.yaml
index 91758cd9a..c731d2a30 100644
--- a/releases/fraser/clover.yaml
+++ b/releases/fraser/clover.yaml
@@ -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
diff --git a/releases/fraser/compass4nfv.yaml b/releases/fraser/compass4nfv.yaml
index 5b5c777c5..5c443361c 100644
--- a/releases/fraser/compass4nfv.yaml
+++ b/releases/fraser/compass4nfv.yaml
@@ -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
diff --git a/releases/fraser/container4nfv.yaml b/releases/fraser/container4nfv.yaml
index 4873937a2..ed42ff0f7 100644
--- a/releases/fraser/container4nfv.yaml
+++ b/releases/fraser/container4nfv.yaml
@@ -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: 84ce45c8bf6e03f0373d9c46e0a8b7e0b3faa605
+
+release-notes:
+ http://docs.opnfv.org/en/stable-fraser/submodules/container4nfv/docs/release/release-notes/release-notes.html
diff --git a/releases/fraser/daisy.yaml b/releases/fraser/daisy.yaml
index 78efc4810..eddd87dba 100644
--- a/releases/fraser/daisy.yaml
+++ b/releases/fraser/daisy.yaml
@@ -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:
diff --git a/releases/fraser/doctor.yaml b/releases/fraser/doctor.yaml
index bc74a0346..28cfe7b19 100644
--- a/releases/fraser/doctor.yaml
+++ b/releases/fraser/doctor.yaml
@@ -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
diff --git a/releases/fraser/fuel.yaml b/releases/fraser/fuel.yaml
index d0b7b1912..226ba5834 100644
--- a/releases/fraser/fuel.yaml
+++ b/releases/fraser/fuel.yaml
@@ -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
diff --git a/releases/fraser/functest.yaml b/releases/fraser/functest.yaml
index a070418aa..d1837b8b8 100644
--- a/releases/fraser/functest.yaml
+++ b/releases/fraser/functest.yaml
@@ -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:
@@ -13,3 +21,5 @@ branches:
- name: stable/fraser
location:
functest-xtesting: 4e4d8c583fe403db095e950c06030586f2aa929a
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/functest/docs/release/release-notes/index.html
diff --git a/releases/fraser/ipv6.yaml b/releases/fraser/ipv6.yaml
index 853847cc2..2e92199c4 100644
--- a/releases/fraser/ipv6.yaml
+++ b/releases/fraser/ipv6.yaml
@@ -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:
diff --git a/releases/fraser/joid.yaml b/releases/fraser/joid.yaml
index c2ca0cde1..6c230c3ae 100644
--- a/releases/fraser/joid.yaml
+++ b/releases/fraser/joid.yaml
@@ -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
diff --git a/releases/fraser/nfvbench.yaml b/releases/fraser/nfvbench.yaml
index e573a8b69..9df164283 100644
--- a/releases/fraser/nfvbench.yaml
+++ b/releases/fraser/nfvbench.yaml
@@ -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
index da4835cf5..6e2232897 100644
--- a/releases/fraser/opnfvdocs.yaml
+++ b/releases/fraser/opnfvdocs.yaml
@@ -3,6 +3,11 @@ project: opnfvdocs
project-type: infra
release-model: stable
+releases:
+ - version: opnfv-6.0.0
+ location:
+ opnfvdocs: 49538d56771c45d8d437ab00abaa1b52f97ac931
+
branches:
- name: stable/fraser
location:
diff --git a/releases/fraser/ovn4nfv.yaml b/releases/fraser/ovn4nfv.yaml
index a04bd0266..40eac0c2c 100644
--- a/releases/fraser/ovn4nfv.yaml
+++ b/releases/fraser/ovn4nfv.yaml
@@ -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
diff --git a/releases/fraser/parser.yaml b/releases/fraser/parser.yaml
index a5929456e..ddcaa8fdb 100644
--- a/releases/fraser/parser.yaml
+++ b/releases/fraser/parser.yaml
@@ -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
diff --git a/releases/fraser/qtip.yaml b/releases/fraser/qtip.yaml
index 575a53ec1..d564e70b1 100644
--- a/releases/fraser/qtip.yaml
+++ b/releases/fraser/qtip.yaml
@@ -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
diff --git a/releases/fraser/samplevnf.yaml b/releases/fraser/samplevnf.yaml
index c6eda5a0c..3c30f7223 100644
--- a/releases/fraser/samplevnf.yaml
+++ b/releases/fraser/samplevnf.yaml
@@ -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
diff --git a/releases/fraser/sdnvpn.yaml b/releases/fraser/sdnvpn.yaml
index b0a3906e8..6fa8fa546 100644
--- a/releases/fraser/sdnvpn.yaml
+++ b/releases/fraser/sdnvpn.yaml
@@ -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/
diff --git a/releases/fraser/sfc.yaml b/releases/fraser/sfc.yaml
index d42302054..83850d76f 100644
--- a/releases/fraser/sfc.yaml
+++ b/releases/fraser/sfc.yaml
@@ -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/
diff --git a/releases/fraser/snaps.yaml b/releases/fraser/snaps.yaml
index 17318ccae..c6c316c2a 100644
--- a/releases/fraser/snaps.yaml
+++ b/releases/fraser/snaps.yaml
@@ -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
diff --git a/releases/fraser/stor4nfv.yaml b/releases/fraser/stor4nfv.yaml
index 5f4f33aa5..b4fd8454a 100644
--- a/releases/fraser/stor4nfv.yaml
+++ b/releases/fraser/stor4nfv.yaml
@@ -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: fcedde93eb366867ed428d362e2cb8a6b7f28b3c
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/stor4nfv/docs/release/release-notes/index.html
diff --git a/releases/fraser/storperf.yaml b/releases/fraser/storperf.yaml
index 06a37f6bb..1389c7aa2 100644
--- a/releases/fraser/storperf.yaml
+++ b/releases/fraser/storperf.yaml
@@ -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
diff --git a/releases/fraser/vswitchperf.yaml b/releases/fraser/vswitchperf.yaml
index bcf60e757..95d8db6af 100644
--- a/releases/fraser/vswitchperf.yaml
+++ b/releases/fraser/vswitchperf.yaml
@@ -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
diff --git a/releases/fraser/yardstick.yaml b/releases/fraser/yardstick.yaml
index 53bcfa625..59f6c10aa 100644
--- a/releases/fraser/yardstick.yaml
+++ b/releases/fraser/yardstick.yaml
@@ -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