gs-pathname: ''
block-stream: 'brahmaputra'
slave: 'intel-pod7'
+ verify-slave: 'apex-verify-master'
+ daily-slave: 'apex-daily-master'
- brahmaputra:
branch: 'stable/brahmaputra'
gs-pathname: '/brahmaputra'
block-stream: 'master'
slave: 'opnfv-jump-1'
- disabled: false
+ verify-slave: 'apex-verify-brahmaputra'
+ daily-slave: 'apex-daily-brahmaputra'
+ disabled: true
stream1:
- master:
gs-pathname: ''
block-stream: 'brahmaputra'
slave: 'intel-pod7'
+ verify-slave: 'apex-verify-master'
+ daily-slave: 'apex-daily-master'
stream2:
- brahmaputra:
gs-pathname: '/brahmaputra'
block-stream: 'master'
slave: 'opnfv-jump-1'
- disabled: false
+ verify-slave: 'apex-verify-brahmaputra'
+ daily-slave: 'apex-daily-brahmaputra'
+ disabled: true
project: 'apex'
- job-template:
name: 'apex-verify-{stream1}'
- node: '{slave}'
+ node: '{verify-slave}'
parameters:
- apex-parameter:
properties:
- build-blocker:
use-build-blocker: true
+ block-level: 'NODE'
blocking-jobs:
- 'apex-daily.*{stream1}'
- 'apex-deploy.*{stream1}'
- 'apex-build.*{stream1}'
- 'apex-runner.*{stream1}'
- 'apex-verify-{stream1}'
+ - throttle:
+ max-per-node: 1
builders:
- 'apex-build'
- trigger-builds:
- project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream1}'
predefined-parameters: |
- BUILD_DIRECTORY=apex-verify-{stream1}/build_output
+ BUILD_DIRECTORY=apex-verify-{stream1}
OPNFV_CLEAN=yes
git-revision: false
block: true
+ same-node: true
+# - trigger-builds:
+# - project: 'functest-apex-{verify-slave}-suite-{stream1}'
+# predefined-parameters: |
+# DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+# FUNCTEST_SUITE_NAME=vping_userdata
+# block: true
+# same-node: true
- trigger-builds:
- - project: 'functest-apex-{slave}-suite-{stream1}'
+ - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}'
predefined-parameters: |
- DEPLOY_SCENARIO=os-nosdn-nofeature-ha
- FUNCTEST_SUITE_NAME=vping_userdata
+ BUILD_DIRECTORY=apex-verify-{stream1}
+ OPNFV_CLEAN=yes
+ git-revision: false
block: true
+ same-node: true
- 'apex-workspace-cleanup'
- job-template:
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: '{slave}'
+ node: '{daily-slave}'
disabled: false
properties:
- build-blocker:
use-build-blocker: true
+ block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*{stream}'
+ - throttle:
+ max-per-node: 1
builders:
- 'apex-build'
- trigger-builds:
- project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-{stream}/build_output
+ BUILD_DIRECTORY=apex-build-{stream}/build
OPNFV_CLEAN=yes
git-revision: false
+ same-node: true
block: true
- 'apex-upload-artifact'
properties:
- build-blocker:
use-build-blocker: true
+ block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*{stream}'
+ - throttle:
+ max-per-node: 1
builders:
- 'apex-deploy-virtual'
# branch: branch (eg. stable)
node: '{slave}'
- disabled: false
+ disabled: true
scm:
- git-scm:
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: '{slave}'
+ node: '{daily-slave}'
disabled: false
properties:
- build-blocker:
use-build-blocker: true
+ block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*{stream1}'
- 'apex-deploy.*{stream1}'
- project: 'apex-build-{stream1}'
git-revision: true
current-parameters: true
+ same-node: true
block: true
- trigger-builds:
- project: 'apex-deploy-virtual-nosdn-nofeature-ha-{stream1}'
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-{stream1}/build_output
+ BUILD_DIRECTORY=apex-build-{stream1}/build
OPNFV_CLEAN=yes
git-revision: true
+ same-node: true
block: true
- trigger-builds:
- project: 'functest-apex-{slave}-daily-{stream1}'
predefined-parameters:
DEPLOY_SCENARIO=os-nosdn-nofeature-ha
block: true
+ same-node: true
block-thresholds:
build-step-failure-threshold: 'never'
failure-threshold: 'never'
predefined-parameters:
DEPLOY_SCENARIO=os-nosdn-nofeature-ha
block: true
+ same-node: true
block-thresholds:
build-step-failure-threshold: 'never'
failure-threshold: 'never'
description: "Artifact version type"
- string:
name: BUILD_DIRECTORY
- default: $WORKSPACE/build_output
+ default: $WORKSPACE/build
description: "Directory where the build artifact will be located upon the completion of the build."
- string:
name: CACHE_DIRECTORY
# start the build
cd $WORKSPACE/ci
./build.sh $BUILD_ARGS
- RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
+ RPM_VERSION=$(grep Version: $BUILD_DIRECTORY/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
# list the contents of BUILD_OUTPUT directory
ls -al $BUILD_DIRECTORY
# save information regarding artifact into file
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_MD5SUM=$(md5sum $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
+ echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/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_MD5SUM=$(md5sum $BUILD_DIRECTORY/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
+ echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/noarch/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
echo "OPNFV_BUILD_URL=$BUILD_URL"
) > $WORKSPACE/opnfv.properties
echo "--------------------------------------------------------"
source $WORKSPACE/opnfv.properties
# upload artifact and additional files to google storage
- gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1
- RPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL)
- RPM_LIST=$RPM_INSTALL_PATH
- for pkg in common undercloud opendaylight-sfc; do
- RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+ gsutil cp $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1
+ RPM_INSTALL_PATH=$BUILD_DIRECTORY/noarch
+ RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
+ VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//')
+ for pkg in common undercloud opendaylight-sfc onos; do
+ RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
- SRPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL)
- SRPM_LIST=$SRPM_INSTALL_PATH
- for pkg in common undercloud opendaylight-sfc; do
- SRPM_LIST+=" ${SRPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+ SRPM_INSTALL_PATH=$BUILD_DIRECTORY
+ SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL)
+ for pkg in common undercloud opendaylight-sfc onos; do
+ SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
for artifact in $RPM_LIST $SRPM_LIST; do
gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.iso.log 2>&1
elif [[ ! "$ARTIFACT_NAME" == "latest" ]]; then
# if artifact name is passed the pull a
# specific artifact from artifacts.opnfv.org
- RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
+ RPM_INSTALL_PATH=$GS_URL
+ RPM_LIST=$RPM_INSTALL_PATH/$ARTIFACT_NAME
else
if [[ $BUILD_DIRECTORY == *verify* ]]; then
BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
# if opnfv.properties exists then use the
# local build. Source the file so we get local OPNFV vars
source ${BUILD_DIRECTORY}/../opnfv.properties
- RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL)
+ RPM_INSTALL_PATH=${BUILD_DIRECTORY}/noarch
+ RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
else
if [[ $BUILD_DIRECTORY == *verify* ]]; then
echo "BUILD_DIRECTORY is from a verify job, so will not use latest from URL"
[[ -f opnfv.properties ]] || exit 1
# source the file so we get OPNFV vars
source opnfv.properties
- RPM_INSTALL_PATH=$OPNFV_RPM_URL
+ RPM_INSTALL_PATH=$(echo $OPNFV_RPM_URL | sed 's/'"$(basename $OPNFV_RPM_URL)"'//')
+ RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
fi
fi
# use local build for verify
if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
if [ ! -e "${WORKSPACE}/build/lib" ]; then ln -s ${WORKSPACE}/lib ${WORKSPACE}/build/lib; fi
- DEPLOY_CMD="./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
+ DEPLOY_CMD="CONFIG=${WORKSPACE}/build RESOURCES=${WORKSPACE}/build/images/ ./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
DEPLOY_FILE="${WORKSPACE}/config/deploy/${DEPLOY_SCENARIO}.yaml"
NETWORK_FILE="${WORKSPACE}/config/network/network_settings.yaml"
# Make sure python34 is installed
exit 1
fi
fi
+ if ! rpm -q python34-setuptools > /dev/null; then
+ if ! sudo yum install -y python34-setuptools; then
+ echo "Failed to install python34-setuptools"
+ exit 1
+ fi
+ fi
if [ -z ${PYTHONPATH:-} ]; then
export PYTHONPATH=${WORKSPACE}/lib/python
else
export PYTHONPATH=$PYTHONPATH:${WORKSPACE}/lib/python
fi
else
- RPM_LIST=$RPM_INSTALL_PATH
- for pkg in common undercloud opendaylight-sfc; do
- RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+ VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | sed 's/opnfv-apex-//')
+ for pkg in common undercloud opendaylight-sfc onos; do
+ RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
# update / install the new rpm
if rpm -q opnfv-apex > /dev/null; then
- if [ $(basename $OPNFV_RPM_URL) == $(rpm -q opnfv-apex).rpm ]; then
- echo "RPM is already installed"
- elif sudo yum update -y $RPM_LIST | grep "does not update installed package"; then
- if ! sudo yum downgrade -y $RPM_LIST; then
- sudo yum remove -y opnfv-undercloud opnfv-common
- sudo yum downgrade -y $RPM_INSTALL_PATH
+ INSTALLED_RPMS=$(rpm -qa | grep apex)
+ for x in $INSTALLED_RPMS; do
+ INSTALLED_RPM_VER=$(echo $x | sed 's/opnfv-apex-//').rpm
+ # Does each RPM's version match the version required for deployment
+ if [ "$INSTALLED_RPM_VER" == "$VERSION_EXTENSION" ]; then
+ echo "RPM $x is already installed"
+ else
+ echo "RPM $x does not match $VERSION_EXTENSION"
+ echo "Will upgrade/downgrade RPMs..."
+ # Try to upgrade/downgrade RPMS
+ if sudo yum update -y $RPM_LIST | grep "does not update installed package"; then
+ if ! sudo yum downgrade -y $RPM_LIST; then
+ sudo yum remove -y opnfv-apex-undercloud opnfv-apex-common opnfv-apex-opendaylight-sfc opnfv-apex-onos
+ sudo yum downgrade -y $RPM_INSTALL_PATH
+ fi
fi
- fi
+ break
+ fi
+ done
else
sudo yum install -y $RPM_LIST;
fi
DEPLOY_CMD=opnfv-deploy
DEPLOY_FILE="/etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
NETWORK_FILE="/etc/opnfv-apex/network_settings.yaml"
+ export RESOURCES="/var/opt/opnfv/images"
+ export CONFIG="/var/opt/opnfv"
fi
if [ "$OPNFV_CLEAN" == 'yes' ]; then
if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
- sudo ./clean.sh
+ sudo CONFIG=../lib ./clean.sh
else
sudo opnfv-clean
fi
Code Review / releng.git / blobdiff