diff options
94 files changed, 942 insertions, 801 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 94d464259..35c2b8544 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -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 diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index 066d61203..3efe1cbc7 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -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} diff --git a/jjb/apex/apex-fetch-logs.sh b/jjb/apex/apex-fetch-logs.sh index f25f456b1..bdb2252b3 100755 --- a/jjb/apex/apex-fetch-logs.sh +++ b/jjb/apex/apex-fetch-logs.sh @@ -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" 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-unit-test.sh b/jjb/apex/apex-unit-test.sh index 3112c9d36..3f15847f2 100755 --- a/jjb/apex/apex-unit-test.sh +++ b/jjb/apex/apex-unit-test.sh @@ -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 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/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 79b358815..7dbd6709b 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -315,6 +315,12 @@ 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 @@ -323,7 +329,7 @@ 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 @@ -334,12 +340,6 @@ 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 diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 80ba50b71..587a06377 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -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' @@ -82,16 +82,10 @@ <<: *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': @@ -150,45 +144,9 @@ <<: *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 @@ -532,6 +490,7 @@ - multijob: name: 'Baremetal Deploy' condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -541,7 +500,16 @@ 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: @@ -559,7 +527,7 @@ - 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 @@ -1260,14 +1228,6 @@ 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 @@ -1284,22 +1244,6 @@ 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 @@ -1550,151 +1494,7 @@ 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: | @@ -1702,7 +1502,7 @@ 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: | diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 29a93b4d0..4620bbc7e 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -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' @@ -374,6 +374,7 @@ - multijob: name: 'Baremetal Deploy' condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -383,7 +384,16 @@ 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: @@ -401,7 +411,7 @@ - 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 diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index 58f1c64f4..2650eafbb 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -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' diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index c74e3c83d..5bf64c11d 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -164,9 +164,7 @@ - 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: @@ -189,7 +187,7 @@ - condition-kind: day-of-week day-selector: select-days days: - TUES: true + SUN: true use-build-time: true steps: - trigger-builds: @@ -250,6 +248,7 @@ gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' + - testapi-parameter - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' @@ -262,6 +261,7 @@ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' builders: + - track-begin-timestamp - shell: !include-raw-escape: ../fuel/fuel-deploy.sh @@ -269,6 +269,7 @@ - email: recipients: armband@enea.com - email-jenkins-admins-on-failure + - report-provision-result ######################## # trigger macros diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml index d29673820..92176207f 100644 --- a/jjb/barometer/barometer.yml +++ b/jjb/barometer/barometer.yml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index bebac995b..d4930d745 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -26,11 +26,6 @@ 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' diff --git a/jjb/calipso/calipso.yml b/jjb/calipso/calipso.yml index 2d9ecef03..6701e7ca2 100644 --- a/jjb/calipso/calipso.yml +++ b/jjb/calipso/calipso.yml @@ -11,8 +11,9 @@ - master: branch: '{stream}' disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' + gs-pathname: '/{stream}' disabled: false - job-template: diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml index 56aee174c..cd3831310 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml @@ -34,7 +34,6 @@ - dovetail - dpacc - enfv - - fastpathmetrics - fds - fuel - functest @@ -43,12 +42,9 @@ - kvmfornfv - models - moon - - multisite - netready - nfvbench - - octopus - onosfw - - openretriever - opera - opnfvdocs - orchestra @@ -159,7 +155,7 @@ 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}' diff --git a/jjb/clover/clover-project.yml b/jjb/clover/clover-project.yml index 9744688a7..31eed8f14 100644 --- a/jjb/clover/clover-project.yml +++ b/jjb/clover/clover-project.yml @@ -84,7 +84,7 @@ - git-scm triggers: - - timed: '0 11 * * *' + - timed: '0 8 * * *' wrappers: - fix-workspace-permissions @@ -153,7 +153,7 @@ - git-scm triggers: - - timed: '0 12 * * *' + - timed: '0 9 * * *' builders: - shell: | diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 0d5f92c2a..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} @@ -790,7 +790,7 @@ - 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: @@ -802,7 +802,7 @@ - trigger: name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger' triggers: - - timed: '' + - timed: '0 7 2-30/2 * *' # --------------------- # noha-baremetal-fraser diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 13830ce1d..dc935f024 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -20,7 +20,7 @@ gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' ppa-pathname: '/{stream}' diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml index 444b17361..c357ff641 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yml +++ b/jjb/compass4nfv/compass-verify-jobs.yml @@ -14,14 +14,14 @@ 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: diff --git a/jjb/container4nfv/container4nfv-arm64.yml b/jjb/container4nfv/container4nfv-arm64.yml index 324624387..5f5bc8627 100644 --- a/jjb/container4nfv/container4nfv-arm64.yml +++ b/jjb/container4nfv/container4nfv-arm64.yml @@ -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 @@ -15,11 +20,11 @@ - 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}' @@ -28,12 +33,12 @@ - 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: @@ -53,19 +58,38 @@ - 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 * * *' diff --git a/jjb/container4nfv/container4nfv-project.yml b/jjb/container4nfv/container4nfv-project.yml index 1ab50ae30..194a1a989 100644 --- a/jjb/container4nfv/container4nfv-project.yml +++ b/jjb/container4nfv/container4nfv-project.yml @@ -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' @@ -134,7 +135,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 - node: name: SLAVE_NAME diff --git a/jjb/container4nfv/yardstick-arm64.yml b/jjb/container4nfv/yardstick-arm64.yml index 9b8b271df..6ed345ecc 100644 --- a/jjb/container4nfv/yardstick-arm64.yml +++ b/jjb/container4nfv/yardstick-arm64.yml @@ -15,6 +15,11 @@ 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 # ------------------------------- diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 2eb27a663..1769bb4da 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -48,9 +48,12 @@ # ------------------------------- # 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 @@ -121,6 +124,9 @@ - 'testapi-parameter' - 'daisy-project-parameter': gs-pathname: '{gs-pathname}' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' builders: - description-setter: @@ -149,30 +155,20 @@ 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}' @@ -193,8 +189,8 @@ 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: @@ -207,6 +203,7 @@ - 'testapi-parameter' - 'daisy-project-parameter': gs-pathname: '{gs-pathname}' + - 'deploy-scenario' - string: name: DEPLOY_TIMEOUT default: '150' @@ -240,7 +237,7 @@ - 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' @@ -250,7 +247,7 @@ - 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' @@ -288,7 +285,7 @@ - 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' @@ -298,7 +295,7 @@ - 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' @@ -330,6 +327,54 @@ - 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 # ---------------------------------------------- # ovs_dpdk Scenarios diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index 3ea74a9a8..cb0dea196 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -219,8 +219,8 @@ 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: diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index eba22dc05..3985356c1 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -16,10 +16,15 @@ 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' @@ -36,89 +41,18 @@ 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: @@ -134,7 +68,7 @@ # 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}' @@ -145,12 +79,7 @@ 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 @@ -159,12 +88,7 @@ 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 @@ -172,12 +96,7 @@ 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 @@ -186,7 +105,6 @@ 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: @@ -203,7 +121,9 @@ branch: '{branch}' - '{installer}-defaults' - 'doctor-slave-parameter' - - 'doctor-parameter' + - 'doctor-parameter': + docker-tag: '{docker-tag}' + scenario: '{scenario}' - 'doctor-functest-parameter' scm: - git-scm-gerrit @@ -233,7 +153,7 @@ 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: @@ -276,11 +196,6 @@ # ------------------------------- - builder: - name: 'doctor-verify-unit-test-builders-macro' - builders: - - shell: "tox -e pep8" - -- builder: name: 'doctor-verify-installer-inspector-builders-macro' builders: - 'clean-workspace-log' @@ -317,13 +232,6 @@ 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 diff --git a/jjb/domino/domino.yml b/jjb/domino/domino.yml index 7fc818c7a..e91260463 100644 --- a/jjb/domino/domino.yml +++ b/jjb/domino/domino.yml @@ -12,10 +12,6 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - job-template: name: 'domino-verify-{stream}' diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 5e5b6e18f..a95617ae4 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -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}' @@ -54,12 +54,12 @@ 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 @@ -75,12 +75,12 @@ 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 @@ -102,12 +102,12 @@ 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 @@ -123,12 +123,12 @@ 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 # ------------------------------- @@ -156,22 +156,22 @@ 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: diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index d01128385..a5148cde9 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -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 diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index 9c7b5da20..7110daeaf 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -298,6 +298,7 @@ gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' + - testapi-parameter - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' @@ -312,6 +313,7 @@ builders: - description-setter: description: "Built on $NODE_NAME" + - track-begin-timestamp - shell: !include-raw-escape: ./fuel-download-artifact.sh - shell: @@ -321,6 +323,7 @@ - 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}' diff --git a/jjb/fuel/fuel-weekly-jobs.yml b/jjb/fuel/fuel-weekly-jobs.yml index 459d0d1a7..aca625d2b 100644 --- a/jjb/fuel/fuel-weekly-jobs.yml +++ b/jjb/fuel/fuel-weekly-jobs.yml @@ -153,6 +153,7 @@ gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' + - testapi-parameter - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' @@ -167,6 +168,7 @@ builders: - description-setter: description: "Built on $NODE_NAME" + - track-begin-timestamp - shell: !include-raw-escape: ./fuel-deploy.sh @@ -174,6 +176,7 @@ - email: recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com - email-jenkins-admins-on-failure + - report-provision-result ######################## # trigger macros diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 72b94bd18..440b00af9 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -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 diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index b93a56bad..ae226b665 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -18,10 +18,6 @@ stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' - euphrates: &euphrates - stream: euphrates - branch: 'stable/{stream}' - gs-pathname: '/{stream}' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- @@ -43,11 +39,11 @@ - 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 @@ -60,11 +56,11 @@ - 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 @@ -77,11 +73,11 @@ - 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 @@ -92,13 +88,13 @@ 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 @@ -111,11 +107,11 @@ - 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 @@ -128,11 +124,11 @@ - 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 @@ -168,7 +164,7 @@ - zte-pod1: slave-label: '{pod}' installer: fuel - <<: *euphrates + <<: *fraser - zte-pod2: slave-label: '{pod}' installer: daisy @@ -176,7 +172,7 @@ - zte-pod2: slave-label: '{pod}' installer: daisy - <<: *euphrates + <<: *fraser - zte-pod3: slave-label: '{pod}' installer: daisy @@ -184,11 +180,15 @@ - 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: diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 9017354cc..419c4e051 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -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 diff --git a/jjb/functest/functest-kubernetes-docker.yml b/jjb/functest/functest-kubernetes-docker.yml index de1895dce..2085251c6 100644 --- a/jjb/functest/functest-kubernetes-docker.yml +++ b/jjb/functest/functest-kubernetes-docker.yml @@ -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 @@ -89,6 +92,20 @@ 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' @@ -107,16 +124,7 @@ 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 diff --git a/jjb/functest/functest-kubernetes-project-jobs.yml b/jjb/functest/functest-kubernetes-project-jobs.yml index 55999060a..7f8dd8d53 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yml +++ b/jjb/functest/functest-kubernetes-project-jobs.yml @@ -18,11 +18,7 @@ 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 diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index b3ab3ca37..9a123053f 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -18,11 +18,7 @@ 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 @@ -224,7 +220,7 @@ 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 ################################ diff --git a/jjb/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml index d87ac2f76..c88fa0050 100644 --- a/jjb/functest/functest-weekly-jobs.yml +++ b/jjb/functest/functest-weekly-jobs.yml @@ -22,12 +22,6 @@ 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 # ------------------------------- @@ -49,11 +43,11 @@ - baremetal: slave-label: fuel-baremetal installer: fuel - <<: *euphrates + <<: *fraser - virtual: slave-label: fuel-virtual installer: fuel - <<: *euphrates + <<: *fraser # ------------------------------- jobs: - 'functest-{installer}-{pod}-weekly-{stream}' diff --git a/jjb/functest/xtesting-docker.yml b/jjb/functest/xtesting-docker.yml index dc26344e3..251c3954e 100644 --- a/jjb/functest/xtesting-docker.yml +++ b/jjb/functest/xtesting-docker.yml @@ -12,6 +12,9 @@ - master: branch: '{stream}' disabled: false + - fraser: + branch: 'stable/{stream}' + disabled: false arch_tag: - 'amd64': diff --git a/jjb/functest/xtesting-project-jobs.yml b/jjb/functest/xtesting-project-jobs.yml index bf08775b6..e109387c6 100644 --- a/jjb/functest/xtesting-project-jobs.yml +++ b/jjb/functest/xtesting-project-jobs.yml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index 683ef78ba..f663c4556 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -146,3 +146,11 @@ 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" diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 205802fab..b7335fafa 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -40,6 +40,34 @@ 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: @@ -48,10 +76,6 @@ 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' description: "Installer release version" @@ -82,6 +106,12 @@ 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 @@ -662,22 +692,6 @@ 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: - email-ext: @@ -742,14 +756,6 @@ 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: - email-ext: @@ -766,14 +772,6 @@ 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: - email-ext: @@ -782,14 +780,6 @@ 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: - email-ext: diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 628c13f79..9d8bed45f 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -1005,18 +1005,6 @@ - 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 @@ -1027,17 +1015,6 @@ 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: - label: diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index 1e92fbfef..2719c7292 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -316,7 +316,7 @@ - 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' diff --git a/jjb/nfvbench/nfvbench.yml b/jjb/nfvbench/nfvbench.yml index a01e9aaa6..44e85d2c8 100644 --- a/jjb/nfvbench/nfvbench.yml +++ b/jjb/nfvbench/nfvbench.yml @@ -12,8 +12,13 @@ - 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 index a04d7f10d..000000000 --- a/jjb/octopus/octopus.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -################################ -# job configuration for Octopus -################################ -- project: - name: octopus - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index 28f9354fa..ece856903 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -8,6 +8,8 @@ stream: - master: branch: 'master' + - fraser: + branch: 'stable/{stream}' - danube: branch: 'stable/{stream}' - euphrates: diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index 908ddba9d..5f08f69a4 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -17,6 +17,10 @@ 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 diff --git a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml index 0316ff70e..2ce4b6df9 100644 --- a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml +++ b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml @@ -13,10 +13,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false jobs: - 'ovn4nfv-build-{stream}' diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 87544196a..574138f6d 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -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 index b686d9524..000000000 --- a/jjb/prediction/prediction.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: prediction - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml index b130912f3..4e79c0553 100644 --- a/jjb/qtip/qtip-experimental-jobs.yml +++ b/jjb/qtip/qtip-experimental-jobs.yml @@ -15,9 +15,9 @@ disabled: false pod: - - zte-virtual6: - installer: fuel - pod: zte-virtual6 + - zte-virtual5: + installer: apex + pod: zte-virtual5 ################################ ## job templates diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index f20b321ad..0fc623c74 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -44,6 +44,21 @@ 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 # ------------------------------- diff --git a/jjb/releng/opnfv-docker-arm.yml b/jjb/releng/opnfv-docker-arm.yml index 9d79ea570..9066b419e 100644 --- a/jjb/releng/opnfv-docker-arm.yml +++ b/jjb/releng/opnfv-docker-arm.yml @@ -129,7 +129,7 @@ <<: *storperf-arm-receivers - 'yardstick': project: 'yardstick' - <<: *euphrates + <<: *fraser <<: *yardstick-arm-receivers # yamllint enable rule:key-duplicates diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 630a7ea22..b7d1ce66f 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -77,6 +77,36 @@ 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 @@ -141,11 +171,13 @@ <<: *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' @@ -179,14 +211,48 @@ <<: *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}" diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml index 80893de89..aac8c3160 100644 --- a/jjb/releng/opnfv-lint.yml +++ b/jjb/releng/opnfv-lint.yml @@ -122,7 +122,7 @@ 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}' @@ -172,7 +172,7 @@ 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}' diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml index fb3bab42b..19fb4b5af 100644 --- a/jjb/releng/opnfv-utils.yml +++ b/jjb/releng/opnfv-utils.yml @@ -129,6 +129,7 @@ default-slaves: - lf-build1 - lf-build2 + - ericsson-build4 allowed-multiselect: true ignore-offline-nodes: true - project-parameter: diff --git a/jjb/sfc/sfc-project-jobs.yml b/jjb/sfc/sfc-project-jobs.yml index 1fb4d990a..fea792467 100644 --- a/jjb/sfc/sfc-project-jobs.yml +++ b/jjb/sfc/sfc-project-jobs.yml @@ -20,10 +20,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - job-template: name: 'sfc-verify-{stream}' diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 01a154aec..ba0742f3b 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -19,10 +19,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - job-template: diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml index 2fb7c2167..920ecdc7d 100644 --- a/jjb/xci/bifrost-verify-jobs.yml +++ b/jjb/xci/bifrost-verify-jobs.yml @@ -12,19 +12,19 @@ # ------------------------------- 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' diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index 9d524bcb0..c810212e3 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -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 diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index aa98e07aa..6d43c9789 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -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} diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh index c3012cd88..c28093d27 100755 --- a/jjb/xci/xci-set-scenario.sh +++ b/jjb/xci/xci-set-scenario.sh @@ -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) diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml index 24c7f319b..4df3f520d 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yml +++ b/jjb/yardstick/yardstick-daily-jobs.yml @@ -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' @@ -41,15 +41,15 @@ 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 @@ -65,12 +65,12 @@ 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 @@ -86,12 +86,12 @@ 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 @@ -107,12 +107,12 @@ 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 @@ -128,18 +128,23 @@ 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 @@ -162,7 +167,7 @@ slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - zte-pod2: slave-label: '{pod}' installer: daisy @@ -173,6 +178,21 @@ 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 @@ -330,7 +350,7 @@ 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 @@ -338,7 +358,7 @@ 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 @@ -450,6 +470,14 @@ 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: - string: diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 63ce2986f..56e825e19 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -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 @@ -169,11 +170,11 @@ 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 ..." @@ -193,11 +194,11 @@ 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 ..." diff --git a/releases/fraser/apex.yaml b/releases/fraser/apex.yaml index 70f34fa88..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: @@ -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 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/calipso.yaml b/releases/fraser/calipso.yaml new file mode 100644 index 000000000..e334910a9 --- /dev/null +++ b/releases/fraser/calipso.yaml @@ -0,0 +1,9 @@ +--- +project: calipso +project-type: tools +release-model: stable + +branches: + - name: stable/fraser + location: + calipso: 2e47d8704fa0fe56ced38ddb4fc94f111079bd82 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 f117f33fd..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: I6145b406450b0846999223f1e4e6783eb06bb0a9 + 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 9956e9681..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: @@ -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 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 new file mode 100644 index 000000000..6e2232897 --- /dev/null +++ b/releases/fraser/opnfvdocs.yaml @@ -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 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 4700233aa..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: I05dd6f833716e36d173f0b4e7f6a317d41f1a039 + 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 |