abort-all-job: true
git-revision: false
+ publishers:
+ - groovy-postbuild:
+ script:
+ !include-raw-escape: ./update-build-result.groovy
# Baremetal test job
- job-template:
enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
abort-all-job: false
git-revision: false
- - conditional-step:
- condition-kind: current-status
- condition-worst: SUCCESS
- condtion-best: SUCCESS
- on-evaluation-failure: mark-unstable
- steps:
- - shell: 'echo "Tests Passed"'
# Build status is always success due conditional plugin prefetching
# build status before multijob phases execute
# - conditional-step:
# steps:
# - shell: 'echo "Tests Passed"'
- publishers:
- - groovy-postbuild:
- script:
- !include-raw-escape: ./update-build-result.groovy
-
# danube Daily
- job-template:
abort-all-job: true
git-revision: false
+ publishers:
+ - groovy-postbuild:
+ script:
+ !include-raw-escape: ./update-build-result.groovy
# Baremetal test job
- job-template:
enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
abort-all-job: false
git-revision: false
- - conditional-step:
- condition-kind: current-status
- condition-worst: SUCCESS
- condtion-best: SUCCESS
- on-evaluation-failure: mark-unstable
- steps:
- - shell: 'echo "Tests Passed"'
# Build status is always success due conditional plugin prefetching
# build status before multijob phases execute
# - conditional-step:
# steps:
# - shell: 'echo "Tests Passed"'
- publishers:
- - groovy-postbuild:
- script:
- !include-raw-escape: ./update-build-result.groovy
-
{% for stream in scenarios %}
# {{ stream }} Daily
- job-template:
import hudson.model.*
-if (manager.build.@result == hudson.model.Result.FAILURE) {
+if (manager.logContains('^.*apex-deploy-baremetal.*SUCCESS$')
+ && manager.build.@result == hudson.model.Result.FAILURE) {
manager.build.@result = hudson.model.Result.UNSTABLE
}
pod:
#compass CI PODs
- baremetal:
- slave-label: compass-baremetal
+ slave-label: compass-baremetal-master
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- virtual:
- slave-label: compass-virtual
+ slave-label: compass-virtual-master
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- baremetal:
- slave-label: compass-baremetal
+ slave-label: compass-baremetal-branch
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
- virtual:
- slave-label: compass-virtual
+ slave-label: compass-virtual-branch
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
####################
- parameter:
- name: 'bottlenecks-params-compass-baremetal'
+ name: 'bottlenecks-params-compass-baremetal-master'
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
- default: '104.197.68.199:8086'
+ default: 'http://testresults.opnfv.org/test/api/v1/results'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'bottlenecks-params-compass-virtual'
+ name: 'bottlenecks-params-compass-virtual-master'
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
- default: ''
+ default: 'http://testresults.opnfv.org/test/api/v1/results'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'bottlenecks-params-orange-pod2'
+ name: 'bottlenecks-params-compass-baremetal-branch'
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
- default: '104.197.68.199:8086'
+ default: 'http://testresults.opnfv.org/test/api/v1/results'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-compass-virtual-branch'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: 'http://testresults.opnfv.org/test/api/v1/results'
description: 'Arguments to use in order to choose the backend DB'
docker pull opnfv/bottlenecks:${DOCKER_TAG} >$redirect
opts="--privileged=true -id"
+ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
+ -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \
+ -e BRANCH=${BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \
+ -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL} \
+ -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
docker_volume="-v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp"
- cmd="docker run ${opts} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash"
+ cmd="docker run ${opts} ${envs} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash"
echo "BOTTLENECKS INFO: running docker run commond: ${cmd}"
${cmd} >$redirect
sleep 5
if [[ $SUITE_NAME == posca_stress_traffic ]]; then
TEST_CASE=posca_factor_system_bandwidth
- docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT
+ testcase_cmd="docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT"
+ echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}"
+ ${testcase_cmd} >$redirect
elif [[ $SUITE_NAME == posca_stress_ping ]]; then
TEST_CASE=posca_factor_ping
- docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT
+ testcase_cmd="docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT"
+ echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}"
+ ${testcase_cmd} >$redirect
fi
fi
if grep ERROR securityaudit.log; then
EXITSTATUS=1
fi
-
- cat securityaudit.log | awk -F"ERROR - " '{print $2}' > shortlog
-
+
+ cat securityaudit.log | awk -F"ERROR - " '{print $2}' | sed -e "s/\"/\\\\\"/g;s/\'/\\\\\'/g"> shortlog
+
ssh -p 29418 gerrit.opnfv.org \
"gerrit review -p $GERRIT_PROJECT \
-m \"$(cat shortlog)\" \
$GERRIT_PATCHSET_REVISION \
--notify NONE"
-
+
exit $EXITSTATUS
fi
#!/bin/bash
cd $WORKSPACE
+REPORTDIR='.reports'
+mkdir -p $REPORTDIR
echo "Generating patchset file to list changed files"
git diff HEAD^1 --name-only | sed "s#^#/home/opnfv/anteater/$PROJECT/#" > $WORKSPACE/patchset
echo "Changed files are"
cat $WORKSPACE/patchset
echo "--------------------------------------------------------"
-vols="-v $WORKSPACE:/home/opnfv/anteater/$PROJECT"
+vols="-v $WORKSPACE:/home/opnfv/anteater/$PROJECT -v $WORKSPACE/$REPORTDIR:/home/opnfv/anteater/$REPORTDIR"
envs="-e PROJECT=$PROJECT"
echo "Pulling releng-anteater docker image"
builders:
- anteater-security-audit
- report-security-audit-result-to-gerrit
+ publishers:
+ - archive-artifacts:
+ artifacts: ".reports/*"
+
########################
# builder macros
########################
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
triggers:
- - timed: '0 23 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
triggers:
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 22 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
triggers:
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: '0 20 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
triggers:
projects:
- name: 'functest-compass-virtual-suite-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
FUNCTEST_SUITE_NAME=healthcheck
+ DEPLOY_SCENARIO=os-nosdn-nofeature-ha
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
- name: 'functest-compass-virtual-suite-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
FUNCTEST_SUITE_NAME=vping_ssh
+ DEPLOY_SCENARIO=os-nosdn-nofeature-ha
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
+ files: 'tests/**'
builders:
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
+ files: 'tests/**'
builders:
- 'clean-workspace-log'
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: 'tests/**'
+ pattern: '{files}'
skip-vote:
successful: true
failed: true
branch: 'stable/{stream}'
dovetail-branch: master
gs-pathname: '/{stream}'
- docker-tag: 'cvp.0.3.0'
+ docker-tag: 'cvp.0.4.0'
#-----------------------------------
# POD, PLATFORM, AND BRANCH MAPPING
branch-pattern: '**/{branch}'
file-paths:
- compare-type: 'ANT'
- pattern: 'tests/**'
+ pattern: '{files}'
skip-vote:
successful: true
failed: true
name: BRIDGE
default: 'br0'
description: 'pxe bridge for booting of Fuel master'
+- parameter:
+ name: zte-pod4-defaults
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - zte-pod4
+ default-slaves:
+ - zte-pod4
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
- parameter:
name: 'juniper-pod1-defaults'
parameters:
auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
- 'k8-ovn-lb-noha':
auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-openbaton-ha':
+ auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'joid-{scenario}-{pod}-daily-{stream}'
name: 'joid-k8-ovn-lb-noha-cengn-pod1-master-trigger'
triggers:
- timed: ''
+
+# os-nosdn-openbaton-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 25 * * *'
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-virtual-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-orange-pod1-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-cengn-pod1-master-trigger'
+ triggers:
+ - timed: ''
--- /dev/null
+######################
+# verify before MERGE
+######################
+
+- project:
+ name: qtip-integration-jobs
+ project: qtip
+ jobs:
+ - 'qtip-storage-{stream}'
+ stream:
+ - master:
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+
+################################
+## job templates
+#################################
+
+- job-template:
+ name: 'qtip-storage-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ # Pin the tests on zte-pod4 with apex deployment
+ - apex-defaults
+ - zte-pod4-defaults
+ scm:
+ - git-scm-gerrit
+
+ triggers:
+ - experimental:
+ project: {project}
+ branch: {branch}
+ files: '**'
+
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -o errexit
+ set -o pipefail
+ set -o xtrace
+
+ source integration/storperf/storperf.sh
if [ "$base_url" != "" ]; then
sudo crudini --set --existing $FILE api url $base_url/api/v1
- sudo crudini --set --existing $FILE swagger base_url $base_url
sudo crudini --set --existing $FILE ui url $base_url
sudo echo "{\"testapiApiUrl\": \"$base_url/api/v1\"}" > \
/usr/local/lib/python2.7/dist-packages/opnfv_testapi/static/testapi-ui/config.json
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
-
[ui]
url = http://localhost:8000
def make_app():
- swagger.docs(base_url=CONF.swagger_base_url,
+ swagger.docs(base_url=CONF.ui_url,
static_path=CONF.static_path)
return swagger.Application(
url_mappings.mappings,
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
debug = True
authenticate = notboolean
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
assert CONF.api_port == 8000
assert CONF.api_debug is True
assert CONF.api_authenticate is False
- assert CONF.swagger_base_url == 'http://localhost:8000'
+ assert CONF.ui_url == 'http://localhost:8000'
Code Review / releng.git / commitdiff