- 'apex-verify-{stream}'
- 'apex-merge-{stream}'
- 'apex-build-{stream}'
- - 'apex-virtual-deploy-{stream}'
- - 'apex-baremetal-deploy-{stream}'
+ - 'apex-deploy-virtual-{stream}'
+ - 'apex-deploy-baremetal-{stream}'
- 'apex-daily-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
- master:
branch: 'master'
gs-pathname: ''
- flags: '-fM'
- disabled: false
project: 'apex'
- job-template:
name: 'apex-verify-{stream}'
- node: opnfv-jump-1
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
+ node: intel-us-deploy-virtual-2
parameters:
- apex-parameter:
gs-pathname: '{gs-pathname}'
- flags: '{flags}'
- project-parameter:
project: '{project}'
- gerrit-parameter:
#
# This job's purpose is to update all the JJB
- node: opnfv-jump-1
+ node: intel-us-deploy-virtual-2
+
+ disabled: true
parameters:
- apex-parameter:
gs-pathname: '{gs-pathname}'
- flags: '{flags}'
- project-parameter:
project: '{project}'
- gerrit-parameter:
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: opnfv-jump-1
+ node: intel-us-deploy-virtual-2
disabled: false
project: '{project}'
- apex-parameter:
gs-pathname: '{gs-pathname}'
- flags: '{flags}'
- gerrit-parameter:
branch: '{branch}'
- string:
refspec: ''
branch: '{branch}'
- triggers:
- - 'apex-{stream}'
-
builders:
- 'apex-build'
- 'apex-deploy-virtual'
- 'apex-workspace-cleanup'
- job-template:
- name: 'apex-virtual-deploy-{stream}'
+ name: 'apex-deploy-virtual-{stream}'
# Job template for virtual deployment
#
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: opnfv-jump-1
+ node: intel-us-deploy-virtual-2
disabled: false
+ scm:
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: '{branch}'
+
parameters:
- project-parameter:
project: '{project}'
- apex-parameter:
gs-pathname: '{gs-pathname}'
- flags: '{flags}'
builders:
- 'apex-deploy-virtual'
- 'apex-workspace-cleanup'
- job-template:
- name: 'apex-baremetal-deploy-{stream}'
+ name: 'apex-deploy-baremetal-{stream}'
# Job template for baremetal deployment
#
disabled: true
+ scm:
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: '{branch}'
+
parameters:
- project-parameter:
project: '{project}'
- apex-parameter:
gs-pathname: '{gs-pathname}'
- flags: '{flags}'
builders:
- 'apex-workspace-cleanup'
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: opnfv-jump-1
+ node: intel-us-deploy-virtual-2
disabled: false
+ scm:
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: '{branch}'
+
parameters:
- project-parameter:
project: '{project}'
- apex-parameter:
gs-pathname: '{gs-pathname}'
- flags: '{flags}'
properties:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- "apex-daily.*"
+
+ triggers:
+ - 'apex-{stream}'
+
builders:
- trigger-builds:
- project: 'apex-build-{stream}'
git-revision: true
block: true
- trigger-builds:
- - project: 'apex-virtual-deploy-{stream}'
+ - project: 'apex-deploy-virtual-{stream}'
git-revision: true
block: true
- trigger-builds:
- - project: 'apex-baremetal-deploy-{stream}'
+ - project: 'apex-deploy-baremetal-{stream}'
- trigger-builds:
- - project: 'functest-apex-{stream}'
+ - project: 'functest-apex-intel-us-deploy-virtual-2-daily-{stream}'
block: true
block-thresholds:
build-step-failure-threshold: 'never'
parameters:
- string:
name: ARTIFACT_NAME
- default: ''
+ default: 'latest'
description: "RPM Artifact name that will be appended to GS_URL to deploy a specific artifact"
- string:
name: BUILD_DIRECTORY
name: GS_URL
default: artifacts.opnfv.org/$PROJECT/{gs-pathname}
description: "URL to Google Storage."
- - string:
- name: FLAGS
- default: '{flags}'
- description: "Build Flags"
########################
# builder macros
# log info to console
echo "Starting the build of Apex using OpenStack Master packages. This will take some time..."
echo "---------------------------------------------------------------------------------------"
- echo "Build flags for this build are ${FLAGS}"
- echo "---------------------------------------------------------------------------------------"
echo
# create the cache directory if it doesn't exist
[[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S")
# start the build
cd $WORKSPACE/ci
- ./build.sh $FLAGS -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY
+ ./build.sh -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY
RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
# list the contents of BUILD_OUTPUT directory
ls -al $BUILD_DIRECTORY
echo "--------------------------------------------------------"
echo
- if [[ -z "$ARTIFACT_NAME" ]]; then
+ if [[ ! "$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
[[ -f opnfv.properties ]] || exit 1
# source the file so we get OPNFV vars
source opnfv.properties
- RPM_INSTALL_PATH=$RPM_URL
+ RPM_INSTALL_PATH=$OPNFV_RPM_URL
fi
fi
# cleanup virtual machines before we start
sudo opnfv-clean
# initiate virtual deployment
- sudo opnfv-deploy -v
+ sudo opnfv-deploy -v -d /usr/share/doc/opnfv/deploy_settings.yaml.example
echo
echo "--------------------------------------------------------"