name: apex
jobs:
- 'apex-verify-{stream}'
- - 'apex-merge-{stream}'
+ - 'apex-runner-{platform}-{scenario}-{stream}'
- 'apex-build-{stream}'
- 'apex-deploy-virtual-{scenario}-{stream}'
- 'apex-deploy-baremetal-{scenario}-{stream}'
- master:
branch: 'master'
gs-pathname: ''
+ block-stream: 'brahmaputra'
- brahmaputra:
branch: 'stable/brahmaputra'
gs-pathname: '/brahmaputra'
- disabled: true
+ block-stream: 'master'
+ disabled: false
project: 'apex'
- 'os-onos-nofeature-ha'
- 'os-opencontrail-nofeature-ha'
+ platform:
+ - 'baremetal'
+ - 'virtual'
+
- job-template:
name: 'apex-verify-{stream}'
pattern: 'lib/**'
- compare-type: ANT
pattern: 'config/**'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**'
properties:
- build-blocker:
- "apex-daily.*"
- "apex-deploy.*"
- "apex-build.*"
+ - "apex-runner.*"
+ - 'apex-verify-{block-stream}'
builders:
- 'apex-build'
- trigger-builds:
- project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
predefined-parameters:
- DEPLOY_SCENARIO="os-odl_l2-nofeature-ha"
- git-revision: true
+ BUILD_DIRECTORY=apex-verify-{stream}/build_output
+ git-revision: false
+ block: true
+ - trigger-builds:
+ - project: 'apex-deploy-virtual-os-onos-nofeature-ha-{stream}'
+ predefined-parameters:
+ BUILD_DIRECTORY=apex-verify-{stream}/build_output
+ git-revision: false
+ block: true
+ - trigger-builds:
+ - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream}'
+ predefined-parameters:
+ BUILD_DIRECTORY=apex-verify-{stream}/build_output
+ git-revision: false
block: true
- 'apex-workspace-cleanup'
- job-template:
- name: 'apex-merge-{stream}'
+ name: 'apex-runner-{platform}-{scenario}-{stream}'
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
+ # runner jobs for deploying manually
node: opnfv-jump-1
- disabled: true
+ disabled: false
parameters:
- apex-parameter:
refspec: ''
choosing-strategy: 'default'
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'apex'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**'
+ properties:
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - "apex-daily.*"
+ - "apex-verify.*"
builders:
- - 'apex-build'
- - 'apex-deploy-virtual'
- - 'apex-workspace-cleanup'
+ - trigger-builds:
+ - project: 'apex-deploy-{platform}-{scenario}-{stream}'
+ git-revision: false
+ block: true
+ - trigger-builds:
+ - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'apex-build-{stream}'
builders:
- 'apex-build'
- - 'apex-deploy-virtual'
+ - trigger-builds:
+ - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
+ predefined-parameters:
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
+ git-revision: false
+ block: true
- 'apex-upload-artifact'
- - 'apex-workspace-cleanup'
- job-template:
name: 'apex-deploy-virtual-{scenario}-{stream}'
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-verify.*"
- "apex-deploy.*"
- - "apex-build.*"
builders:
- 'apex-deploy-virtual'
- "apex-verify.*"
- "apex-deploy.*"
- "apex-build.*"
+ - "apex-runner.*"
triggers:
- - 'apex-master'
+ - 'apex-{stream}'
builders:
- trigger-builds:
- trigger-builds:
- project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}'
predefined-parameters:
- DEPLOY_SCENARIO="os-odl_l2-nofeature-ha"
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
git-revision: true
block: true
- trigger-builds:
- project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream}'
+ predefined-parameters:
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
+ git-revision: true
+ block: true
+ - trigger-builds:
+ - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-onos-nofeature-ha
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
+ predefined-parameters:
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
+ git-revision: true
+ block: true
+ - trigger-builds:
+ - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
block: true
block-thresholds:
build-step-failure-threshold: 'never'
# create the cache directory if it doesn't exist
[[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
# set OPNFV_ARTIFACT_VERSION
- if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
- export OPNFV_ARTIFACT_VERSION="bramaputra.1.rc0"
- else
- if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+ if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+ if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+ export OPNFV_ARTIFACT_VERSION=brahmaputra-dev${BUILD_NUMBER}
+ else
export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
- elif [ "$ARTIFACT_VERSION" == "daily" ]; then
- export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
+ fi
+ elif [ "$ARTIFACT_VERSION" == "daily" ]; then
+ if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+ export OPNFV_ARTIFACT_VERSION=brahmaputra-$(date -u +"%Y-%m-%d")
else
- export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
+ export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
fi
+ else
+ export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
fi
# start the build
cd $WORKSPACE/ci
# 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
- gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL) gs://$GS_URL/$(basename $OPNFV_RPM_URL) > gsutil.iso.log 2>&1
- gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL) gs://$GS_URL/$(basename $OPNFV_SRPM_URL) > 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}}"
+ 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}}"
+ done
+ for artifact in $RPM_LIST $SRPM_LIST; do
+ gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.iso.log 2>&1
+ done
gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1
gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1
# specific artifact from artifacts.opnfv.org
RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
else
- if [[ -f opnfv.properties ]]; then
+ if [[ $BUILD_DIRECTORY == *verify* ]]; then
+ BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+ echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY"
+ elif [[ $BUILD_DIRECTORY == *apex-build* ]]; then
+ BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+ echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY"
+ fi
+
+ if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then
# if opnfv.properties exists then use the
# local build. Source the file so we get local OPNFV vars
- source opnfv.properties
- RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
+ source ${BUILD_DIRECTORY}/../opnfv.properties
+ RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(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"
+ echo "Check that the slave has opnfv.properties in $BUILD_DIRECTORY"
+ exit 1
+ elif [[ $BUILD_DIRECTORY == *apex-build* ]]; then
+ echo "BUILD_DIRECTORY is from a daily job, so will not use latest from URL"
+ echo "Check that the slave has opnfv.properties in $BUILD_DIRECTORY"
+ exit 1
+ fi
# no opnfv.properties means use the latest from artifacts.opnfv.org
# get the latest.properties to get the link to the latest artifact
curl -s -o $WORKSPACE/opnfv.properties http://$GS_URL/latest.properties
fi
fi
- source opnfv.properties
- RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
- if [ ! -e "$RPM_INSTALL_PATH" ]; then
- RPM_INSTALL_PATH=http://${OPNFV_RPM_URL}
- fi
-
RPM_LIST=$RPM_INSTALL_PATH
for pkg in common undercloud; do
RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
if [ -n "$DEPLOY_SCENARIO" ]; then
echo "Deploy Scenario set to ${DEPLOY_SCENARIO}"
if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then
- sudo opnfv-deploy -v -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml -n /etc/opnfv-apex/network_settings.yaml
+ sudo opnfv-deploy -v -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml -n /etc/opnfv-apex/network_settings.yaml --debug
else
echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
exit 1
else
echo "Deploy scenario not set!"
exit 1
+ fi
else
sudo opnfv-deploy -v
fi
# specific artifact from artifacts.opnfv.org
RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
else
- if [[ -f opnfv.properties ]]; then
+ if [[ $BUILD_DIRECTORY == *apex-build* ]]; then
+ BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+ echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY"
+ fi
+ if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then
# if opnfv.properties exists then use the
# local build. Source the file so we get local OPNFV vars
- source opnfv.properties
- RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
+ source ${BUILD_DIRECTORY}/../opnfv.properties
+ RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL)
else
# no opnfv.properties means use the latest from artifacts.opnfv.org
# get the latest.properties to get the link to the latest artifact
fi
fi
- source opnfv.properties
- RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
if [ ! -e "$RPM_INSTALL_PATH" ]; then
RPM_INSTALL_PATH=http://${OPNFV_RPM_URL}
fi
if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then
sudo opnfv-deploy -i /root/inventory/pod_settings.yaml \
-d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml \
- -n /root/network_settings.yaml
+ -n /root/network/network_settings.yaml --debug
else
echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
exit 1
else
echo "Deploy scenario not set!"
exit 1
+ fi
else
echo "File /etc/opnfv-apex/network_settings.yaml does not exist!"
exit 1
########################
- trigger:
name: 'apex-master'
+ triggers:
+ - timed: '0 3 * 12 *'
+- trigger:
+ name: 'apex-brahmaputra'
triggers:
- timed: '0 3 * * *'
Code Review / releng.git / blobdiff