if [[ "$JOB_NAME" == *csit* ]]; then
DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml"
fi
- if [[ "$JOB_NAME" == *promote* ]]; then
+ if [[ "$PROMOTE" == "True" ]]; then
DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2"
fi
else
echo "Will download RPMs..."
# Must be RPMs/ISO
- export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
- echo "Downloading opnfv-${OPNFV_ARTIFACT_VERSION}.properties"
+ echo "Downloading latest properties file"
# get the properties file in order to get info regarding artifacts
- curl --fail -s -o $BUILD_DIRECTORY/opnfv.properties http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties
+ curl --fail -s -o $BUILD_DIRECTORY/opnfv.properties http://$GS_URL/latest.properties
# source the file so we get OPNFV vars
source $BUILD_DIRECTORY/opnfv.properties
virtual-slave: 'apex-virtual-master'
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
+ concurrent-builds: 3
- danube:
branch: 'stable/danube'
virtual-slave: 'apex-virtual-danube'
baremetal-slave: 'apex-baremetal-danube'
verify-scenario: 'os-odl_l3-nofeature-ha'
+ concurrent-builds: 1
disabled: false
platform:
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - multijob:
- name: functest-smoke
- condition: SUCCESSFUL
- projects:
- - name: 'functest-apex-virtual-suite-{stream}'
- current-parameters: false
- predefined-parameters: |
- DEPLOY_SCENARIO={verify-scenario}
- FUNCTEST_SUITE_NAME=healthcheck
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: true
- kill-phase-on: FAILURE
- abort-all-job: true
- git-revision: false
+# - multijob:
+# name: functest-smoke
+# condition: SUCCESSFUL
+# projects:
+# - name: 'functest-apex-virtual-suite-{stream}'
+# current-parameters: false
+# predefined-parameters: |
+# DEPLOY_SCENARIO={verify-scenario}
+# FUNCTEST_SUITE_NAME=healthcheck
+# GERRIT_BRANCH=$GERRIT_BRANCH
+# GERRIT_REFSPEC=$GERRIT_REFSPEC
+# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+# node-parameters: true
+# kill-phase-on: FAILURE
+# abort-all-job: true
+# git-revision: false
# Verify Scenario Gate
- job-template:
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - multijob:
- name: functest-smoke
- condition: SUCCESSFUL
- projects:
- - name: 'functest-apex-virtual-suite-{stream}'
- current-parameters: false
- predefined-parameters: |
- DEPLOY_SCENARIO={verify-scenario}
- FUNCTEST_SUITE_NAME=healthcheck
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: true
- kill-phase-on: FAILURE
- abort-all-job: true
- git-revision: false
+# - multijob:
+# name: functest-smoke
+# condition: SUCCESSFUL
+# projects:
+# - name: 'functest-apex-virtual-suite-{stream}'
+# current-parameters: false
+# predefined-parameters: |
+# DEPLOY_SCENARIO={verify-scenario}
+# FUNCTEST_SUITE_NAME=healthcheck
+# GERRIT_BRANCH=$GERRIT_BRANCH
+# GERRIT_REFSPEC=$GERRIT_REFSPEC
+# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+# node-parameters: true
+# kill-phase-on: FAILURE
+# abort-all-job: true
+# git-revision: false
- job-template:
name: 'apex-runner-cperf-{stream}'
node-parameters: false
current-parameters: true
predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=
OPNFV_CLEAN=yes
DEPLOY_SCENARIO={verify-scenario}
kill-phase-on: FAILURE
abort-all-job: true
git-revision: false
- multijob:
- name: Functest
- condition: ALWAYS
+ name: CPERF
+ condition: SUCCESSFUL
projects:
- - name: 'functest-apex-baremetal-daily-{stream}'
+ - name: 'cperf-apex-intel-pod2-daily-master'
node-parameters: true
current-parameters: false
predefined-parameters:
wrappers:
- timeout:
- timeout: 90
+ timeout: 150
fail: true
properties:
- logrotate-default
- throttle:
- max-per-node: 3
+ max-per-node: {concurrent-builds}
max-total: 10
option: 'project'
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ PROMOTE=True
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ PROMOTE=True
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
name: GS_URL
default: $GS_BASE{gs-pathname}
description: "URL to Google Storage."
+ - string:
+ name: PROMOTE
+ default: 'False'
+ description: "Flag to know if we should promote/upload snapshot artifacts."
########################
# builder macros
virtual-slave: 'apex-virtual-master'
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
+ concurrent-builds: 3
- danube:
branch: 'stable/danube'
virtual-slave: 'apex-virtual-danube'
baremetal-slave: 'apex-baremetal-danube'
verify-scenario: 'os-odl_l3-nofeature-ha'
+ concurrent-builds: 1
disabled: false
platform:
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - multijob:
- name: functest-smoke
- condition: SUCCESSFUL
- projects:
- - name: 'functest-apex-virtual-suite-{stream}'
- current-parameters: false
- predefined-parameters: |
- DEPLOY_SCENARIO={verify-scenario}
- FUNCTEST_SUITE_NAME=healthcheck
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: true
- kill-phase-on: FAILURE
- abort-all-job: true
- git-revision: false
+# - multijob:
+# name: functest-smoke
+# condition: SUCCESSFUL
+# projects:
+# - name: 'functest-apex-virtual-suite-{stream}'
+# current-parameters: false
+# predefined-parameters: |
+# DEPLOY_SCENARIO={verify-scenario}
+# FUNCTEST_SUITE_NAME=healthcheck
+# GERRIT_BRANCH=$GERRIT_BRANCH
+# GERRIT_REFSPEC=$GERRIT_REFSPEC
+# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+# node-parameters: true
+# kill-phase-on: FAILURE
+# abort-all-job: true
+# git-revision: false
# Verify Scenario Gate
- job-template:
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - multijob:
- name: functest-smoke
- condition: SUCCESSFUL
- projects:
- - name: 'functest-apex-virtual-suite-{stream}'
- current-parameters: false
- predefined-parameters: |
- DEPLOY_SCENARIO={verify-scenario}
- FUNCTEST_SUITE_NAME=healthcheck
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: true
- kill-phase-on: FAILURE
- abort-all-job: true
- git-revision: false
+# - multijob:
+# name: functest-smoke
+# condition: SUCCESSFUL
+# projects:
+# - name: 'functest-apex-virtual-suite-{stream}'
+# current-parameters: false
+# predefined-parameters: |
+# DEPLOY_SCENARIO={verify-scenario}
+# FUNCTEST_SUITE_NAME=healthcheck
+# GERRIT_BRANCH=$GERRIT_BRANCH
+# GERRIT_REFSPEC=$GERRIT_REFSPEC
+# GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+# GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+# node-parameters: true
+# kill-phase-on: FAILURE
+# abort-all-job: true
+# git-revision: false
- job-template:
name: 'apex-runner-cperf-{stream}'
node-parameters: false
current-parameters: true
predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=
OPNFV_CLEAN=yes
DEPLOY_SCENARIO={verify-scenario}
kill-phase-on: FAILURE
abort-all-job: true
git-revision: false
- multijob:
- name: Functest
- condition: ALWAYS
+ name: CPERF
+ condition: SUCCESSFUL
projects:
- - name: 'functest-apex-baremetal-daily-{stream}'
+ - name: 'cperf-apex-intel-pod2-daily-master'
node-parameters: true
current-parameters: false
predefined-parameters:
wrappers:
- timeout:
- timeout: 90
+ timeout: 150
fail: true
properties:
- logrotate-default
- throttle:
- max-per-node: 3
+ max-per-node: {concurrent-builds}
max-total: 10
option: 'project'
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ PROMOTE=True
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ PROMOTE=True
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
name: GS_URL
default: $GS_BASE{gs-pathname}
description: "URL to Google Storage."
+ - string:
+ name: PROMOTE
+ default: 'False'
+ description: "Flag to know if we should promote/upload snapshot artifacts."
########################
# builder macros
#set -e
[[ $GERRIT_REFSPEC_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
BOTTLENECKS_IMAGE=opnfv/bottlenecks
+REPORT="True"
if [[ $SUITE_NAME == rubbos || $SUITE_NAME == vstf ]]; then
echo "Bottlenecks: to pull image $BOTTLENECKS_IMAGE:${DOCKER_TAG}"
echo "Bottlenecks: pulling tutum/influxdb for yardstick"
docker pull tutum/influxdb:0.13
sleep 5
- docker exec bottleneckcompose_bottlenecks_1 python ${POSCA_SCRIPT}/run_posca.py testcase $TEST_CASE
+ docker exec bottleneckcompose_bottlenecks_1 python ${POSCA_SCRIPT}/run_posca.py testcase $TEST_CASE $REPORT
elif [[ $SUITE_NAME == posca_stress_ping ]]; then
TEST_CASE=posca_factor_ping
sleep 5
- docker exec bottleneckcompose_bottlenecks_1 python ${POSCA_SCRIPT}/run_posca.py testcase $TEST_CASE
+ docker exec bottleneckcompose_bottlenecks_1 python ${POSCA_SCRIPT}/run_posca.py testcase $TEST_CASE $REPORT
fi
echo "Bottlenecks: cleaning up docker-compose images and dockers"
project: '{project}'
branch: '{branch}'
- 'opnfv-build-centos-defaults'
- - 'daisy-defaults'
+ - '{installer}-defaults'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'daisy-defaults'
+ - '{installer}-defaults'
+ - '{slave-label}-defaults'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
- - 'daisy-defaults'
- - '{slave-label}-defaults'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
enabled: true
max-total: 4
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{alias}-merge-(master|danube)'
+ block-level: 'NODE'
scm:
- git-scm
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{alias}-merge-(master|danube)'
+ - '{alias}-merge-{phase}-.*'
block-level: 'NODE'
scm:
- project-parameter:
project: '{project}'
branch: '{branch}'
+ - '{installer}-defaults'
- '{slave-label}-defaults'
- '{alias}-merge-defaults':
gs-pathname: '{gs-pathname}'
enabled: true
max-total: 4
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{installer}-merge-build-.*'
+ block-level: 'NODE'
+
scm:
- git-scm-gerrit
wrappers:
enabled: true
max-total: 6
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{installer}-merge-build-.*'
+ - '{alias}-verify-build-.*'
+ block-level: 'NODE'
+
scm:
- git-scm-gerrit
wrappers:
- project-parameter:
project: '{project}'
branch: '{branch}'
+ - '{installer}-defaults'
- '{slave-label}-defaults'
- '{alias}-verify-defaults':
gs-pathname: '{gs-pathname}'
+
builders:
- description-setter:
description: "Built on $NODE_NAME"
parameters:
- string:
name: INSTALLER_IP
- default: '10.20.0.2'
+ default: '10.20.7.3'
description: 'IP of the installer'
- string:
name: INSTALLER_TYPE
default: daisy
description: 'Installer used for deploying OPNFV on this POD'
+ - string:
+ name: BRIDGE
+ default: 'br7'
+ description: 'pxe bridge for booting of Fuel master'
- parameter:
name: 'infra-defaults'
- label:
name: SLAVE_LABEL
default: 'daisy-baremetal'
+ - string:
+ name: INSTALLER_IP
+ default: '10.20.11.2'
+ description: 'IP of the installer'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- label:
name: SLAVE_LABEL
default: 'daisy-virtual'
+ - string:
+ name: INSTALLER_IP
+ default: '10.20.11.2'
+ description: 'IP of the installer'
+ - string:
+ name: BRIDGE
+ default: 'daisy1'
+ description: 'pxe bridge for booting of Fuel master'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- string:
name: INSTALLER_IP
- default: '10.20.7.2'
+ default: '10.20.7.3'
description: 'IP of the installer'
- string:
name: BRIDGE