diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/apex/apex-build.sh | 1 | ||||
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 6 | ||||
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 48 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 45 | ||||
| -rw-r--r-- | jjb/releng/automate.yml | 2 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 4 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 7 |
8 files changed, 98 insertions, 17 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh index ad94ba3d7..23ce81015 100755 --- a/jjb/apex/apex-build.sh +++ b/jjb/apex/apex-build.sh @@ -31,6 +31,7 @@ BUILD_DIRECTORY=${WORKSPACE}/build pushd ${BUILD_DIRECTORY} make clean popd +export PYTHONPATH=${WORKSPACE} python3 apex/build.py $BUILD_ARGS RPM_VERSION=$(grep Version: $WORKSPACE/build/rpm_specs/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-') # list the contents of BUILD_OUTPUT directory diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index a47e3a5db..bfed67ea5 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -49,10 +49,10 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then # TODO(trozet) add verification here # Install dev build - mkdir -p ~/tmp - mv -f .build ~/tmp/ + sudo rm -rf /tmp/.build + mv -f .build /tmp/ sudo pip3 install --upgrade --force-reinstall . - mv -f ~/tmp/.build . + mv -f /tmp/.build ${WORKSPACE}/ else DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/" NETWORK_SETTINGS_DIR="/etc/opnfv-apex/" diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index faa5971e1..276f68809 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -113,7 +113,7 @@ same-node: true block: true - trigger-builds: - - project: 'functest-{installer}-{pod}-daily-{stream}' + - project: 'functest-{installer}-{pod}-arm-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index b1d7e748d..cbf175567 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -192,6 +192,8 @@ job-timeout: 60 - 'daily': job-timeout: 240 + - 'arm-daily': + job-timeout: 240 jobs: - 'functest-{installer}-{pod}-{testsuite}-{stream}' @@ -299,12 +301,21 @@ default: 'daily' description: "Daily suite name to run" - parameter: + name: functest-arm-daily-parameter + parameters: + - string: + name: FUNCTEST_SUITE_NAME + default: 'arm-daily' + description: "Daily suite name (Aarch64) to run" +- parameter: name: functest-suite-parameter parameters: - choice: name: FUNCTEST_SUITE_NAME choices: - - 'healthcheck' + - 'connection_check' + - 'api_check' + - 'snaps_health_check' - 'vping_userdata' - 'vping_ssh' - 'tempest_smoke_serial' @@ -312,16 +323,19 @@ - 'odl' - 'odl_netvirt' - 'onos' + - 'snaps_smoke' + - 'refstack_defcore' - 'promise' - 'doctor' - 'bgpvpn' + - 'parser' - 'security_scan' - 'tempest_full_parallel' - 'rally_full' - - 'vims' - - 'multisite' - - 'parser' - - 'opera_vims' + - 'cloudify_ims' + - 'cloudify_vrouter' + - 'orchestra_openims' + - 'orchestra_clearwaterims' - string: name: TESTCASE_OPTIONS default: '' @@ -369,6 +383,15 @@ - 'functest-store-results' - builder: + name: functest-arm-daily-builder + builders: + - 'functest-cleanup' + - 'set-functest-env' + - 'functest-arm-daily' + - 'functest-store-results' + - 'functest-exit' + +- builder: name: functest-suite-builder builders: - 'functest-cleanup' @@ -380,12 +403,10 @@ - builder: name: functest-alpine-daily-builder builders: - - shell: - !include-raw: - - ./functest-env-presetup.sh - - ../../utils/fetch_os_creds.sh - - ./functest-alpine.sh - - ../../utils/push-test-logs.sh + - 'functest-cleanup' + - 'set-functest-env-alpine' + - 'functest-daily' + - 'functest-store-results' - builder: name: functest-daily @@ -393,6 +414,11 @@ - shell: !include-raw: ./functest-alpine.sh +- builder: + name: functest-arm-daily + builders: + - shell: + !include-raw: ./functest-loop.sh - builder: name: functest-suite diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 59c9461be..2acc96fd9 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -95,6 +95,21 @@ - lf-pod3 - parameter: + name: 'arm-pod5-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - arm-pod5 + default-slaves: + - arm-pod5 + - string: + name: BRIDGE + default: 'admin7_br0,mgmt7_br0,,public7_br0' + description: 'Pre-existing bridges used by Fuel' + +- parameter: name: 'lf-pod1-defaults' parameters: - node: @@ -114,6 +129,21 @@ description: 'SSH key to use for Apex' - parameter: + name: 'lf-pod2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - lf-pod2 + default-slaves: + - lf-pod2 + - string: + name: BRIDGE + default: 'pxebr,br-ctl' + description: 'Pre-existing bridges used by Fuel' + +- parameter: name: 'lf-pod3-defaults' parameters: - node: @@ -835,6 +865,21 @@ description: 'SSH key to use for Apex' - parameter: + name: 'arm-virtual2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - arm-virtual2 + default-slaves: + - arm-virtual2 + - string: + name: BRIDGE + default: ',,,public8_br0' + description: 'Pre-existing bridges used by Fuel' + +- parameter: name: 'intel-virtual6-defaults' parameters: - node: diff --git a/jjb/releng/automate.yml b/jjb/releng/automate.yml index c6ca37fa9..908e9a196 100644 --- a/jjb/releng/automate.yml +++ b/jjb/releng/automate.yml @@ -247,7 +247,7 @@ builders: - shell: | sudo bash ./jjb/releng/docker-deploy.sh "sudo docker run -itd --name reporting -p 8084:8000 opnfv/reporting" \ - "http://testresults.opnfv.org/reporting2/reporting/index.html" "reporting" + "http://testresults.opnfv.org/reporting/index.html" "reporting" - builder: name: mongodb-backup diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 414eba255..5b63f3a12 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -51,6 +51,10 @@ project: 'functest' <<: *master <<: *functest-receivers + - 'nfvbench': + project: 'nfvbench' + <<: *master + <<: *other-receivers - 'qtip': project: 'qtip' <<: *master diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 2cdecb208..61dda942a 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -87,7 +87,10 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'false' + disable-strict-forbidden-file-verification: 'true' + file-paths: + - compare-type: ANT + pattern: 'xci/**' forbidden-file-paths: - compare-type: ANT pattern: 'bifrost/**' @@ -97,6 +100,8 @@ pattern: 'upstream/**' - compare-type: ANT pattern: '**/README.rst' + - compare-type: ANT + pattern: 'docs/**' readable-message: true parameters: |