diff options
| -rw-r--r-- | INFO | 31 | ||||
| -rw-r--r-- | jjb-sandbox/releng/releng-sandbox-jobs.yml | 61 | ||||
| -rwxr-xr-x | jjb-sandbox/releng/verify-sandbox-jobs.sh | 21 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 13 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 46 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 6 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 4 | ||||
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yaml | 3 | ||||
| -rw-r--r-- | jjb/auto/auto.yaml | 5 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yaml | 4 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 8 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 46 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 29 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 21 | ||||
| -rw-r--r-- | jjb/releng/compass4nfv-docker.yaml | 1 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 30 | ||||
| -rw-r--r-- | jjb/releng/opnfv-repo-archiver.sh | 2 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yaml | 2 | ||||
| -rw-r--r-- | utils/push-test-logs.sh | 10 |
20 files changed, 172 insertions, 173 deletions
@@ -1,31 +0,0 @@ -Project: Release Engineering (Releng) -Project Creation Date: July 14, 2015 -Project Category: Integration & Testing -Lifecycle State: Incubation -Primary Contact: Fatih Degirmenci -Project Lead: Fatih Degirmenci -Jira Project Name: Release Engineering -Jira Project Prefix: RELENG -Mailing list tag: [releng] -IRC: Server:freenode.net Channel:#opnfv-octopus -Repository: releng -Other Repositories: releng-xci, releng-testresults - -Committers: -Fatih Degirmenci (Ericsson, fatih.degirmenci@ericsson.com) -Aric Gardner (Linux Foundation, agardner@linuxfoundation.org) -Tim Rozet (Red Hat, trozet@redhat.com) -Morgan Richomme (Orange, morgan.richomme@orange.com) -Jose Lausuch (Ericsson, jose.lausuch@ericsson.com) -Ryota Mibu (NEC, r-mibu@cq.jp.nec.com) -Mei Mei (Huawei, meimei@huawei.com) -Trevor Bramwell (Linux Foundation, tbramwell@linuxfoundation.org) -Serena Feng (ZTE, feng.xiaowei@zte.com.cn) -Yolanda Robla Mota (Red Hat, yroblamo@redhat.com) -Markos Chandras (SUSE, mchandras@suse.de) -Luke Hinds (Red Hat, lhinds@redhat.com) - -Link to TSC approval of the project: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html -Link to TSC voting for removal of Victor Laza as committer: http://meetbot.opnfv.org/meetings/opnfv-meeting/2016/opnfv-meeting.2016-02-16-14.59.html -Link to nomination and acceptance of Mei Mei as committer: http://lists.opnfv.org/pipermail/opnfv-tsc/2016-March/002228.html -Links to nomination and accceptance of Trevor Bramwell as committer: http://lists.opnfv.org/pipermail/opnfv-tech-discuss/2016-July/011659.html and http://lists.opnfv.org/pipermail/opnfv-tech-discuss/2016-July/011714.html diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml deleted file mode 100644 index df8b1d56a..000000000 --- a/jjb-sandbox/releng/releng-sandbox-jobs.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -- project: - name: 'releng-sandbox-jobs' - jobs: - - 'releng-deploy-sandbox' - - project: 'releng' - node: 'releng-sandbox' - -- job-template: - name: 'releng-deploy-sandbox' - node: '{node}' - - parameters: - - project-parameter: - project: '{project}' - branch: 'master' - scm: - - git-scm-gerrit - - triggers: - - gerrit: - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'redeploy' - custom-url: '$BUILD_URL deploying to $JENKINS_URL' - silent-start: true - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - file-paths: - - compare-type: ANT - pattern: jjb-sandbox/** - - wrappers: '' - - builders: - - shell: - !include-raw-escape: verify-sandbox-jobs.sh - # yamllint disable rule:line-length - - shell: | - #!/bin/bash - jenkins-jobs update --delete-old -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox - # yamllint enable - publishers: - - archive-artifacts: - artifacts: 'job_output/*' - - email-jenkins-admins-on-failure diff --git a/jjb-sandbox/releng/verify-sandbox-jobs.sh b/jjb-sandbox/releng/verify-sandbox-jobs.sh deleted file mode 100755 index 599016106..000000000 --- a/jjb-sandbox/releng/verify-sandbox-jobs.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 Linux Foundation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -#test for non-ascii characters, these can pass the test and end up breaking things in production -for x in $(find . -name *\.yml); do - - if LC_ALL=C grep -q '[^[:print:][:space:]]' "$x"; then - echo "file "$x" contains non-ascii characters" - exit 1 - fi - -done - -jenkins-jobs test -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox \ - -o job_output diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 8140d9ef5..2f29765d2 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -10,12 +10,12 @@ - master: &master branch: '{stream}' gs-pathname: '' - verify-scenario: 'os-odl-nofeature-ha' + verify-scenario: 'os-nosdn-nofeature-ha' disabled: false - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' - verify-scenario: 'os-odl-nofeature-ha' + verify-scenario: 'os-nosdn-nofeature-ha' disabled: false - danube: &danube branch: 'stable/{stream}' @@ -243,8 +243,8 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_SUITE_NAME=healthcheck - FUNCTEST_MODE=tier + FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_MODE=testcase node-parameters: false kill-phase-on: FAILURE abort-all-job: true @@ -351,14 +351,15 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO - FUNCTEST_MODE=tier - FUNCTEST_TIER=healthcheck + FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_MODE=testcase 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: NEVER + enable-condition: "def m = '$DEPLOY_SCENARIO' != k8s-nosdn-nofeature-noha" abort-all-job: true git-revision: false - multijob: diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index bb5b53d6d..becc20dde 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -144,10 +144,18 @@ <<: *danube - 'os-ovn-nofeature-noha': <<: *danube + - 'os-nosdn-nofeature-noha': + <<: *master + - 'os-nosdn-nofeature-ha': + <<: *master - 'os-odl-nofeature-noha': <<: *master - 'os-odl-nofeature-ha': <<: *master + - 'os-nosdn-queens-noha': + <<: *master + - 'os-nosdn-queens-ha': + <<: *master - 'os-odl-queens-noha': <<: *master - 'os-odl-queens-ha': @@ -623,8 +631,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 1" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: @@ -637,8 +644,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 0" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: @@ -1493,6 +1499,22 @@ name: Baremetal Deploy and Test Phase condition: SUCCESSFUL projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false - name: 'apex-os-odl-nofeature-noha-baremetal-master' node-parameters: false current-parameters: false @@ -1509,6 +1531,22 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - name: 'apex-os-nosdn-queens-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-queens-ha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false - name: 'apex-os-odl-queens-noha-baremetal-master' node-parameters: false current-parameters: false diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 3397f1ed2..e7d592254 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -503,8 +503,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 1" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: @@ -517,8 +516,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 0" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index 8375f6163..71a6c3dbe 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -1,6 +1,10 @@ master: + - 'os-nosdn-nofeature-noha' + - 'os-nosdn-nofeature-ha' - 'os-odl-nofeature-noha' - 'os-odl-nofeature-ha' + - 'os-nosdn-queens-noha' + - 'os-nosdn-queens-ha' - 'os-odl-queens-noha' - 'os-odl-queens-ha' fraser: diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index fe2bbcc63..140f84b03 100644 --- a/jjb/armband/armband-ci-jobs.yaml +++ b/jjb/armband/armband-ci-jobs.yaml @@ -252,6 +252,9 @@ - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' + - string: + name: PROJECT + default: '{project}' scm: - git-scm diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index a454fc4e8..0cfe88f93 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -101,8 +101,9 @@ - trigger-builds: - project: '{installer}-deploy-{pod}-daily-{stream}' current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO='os-nosdn-nofeature-ha' + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + PROJECT=armband same-node: true block: true diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 3985356c1..1c12563a8 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -124,7 +124,9 @@ - 'doctor-parameter': docker-tag: '{docker-tag}' scenario: '{scenario}' - - 'doctor-functest-parameter' + - 'doctor-functest-parameter': + gs-pathname: '{gs-pathname}' + inspector: '{inspector}' scm: - git-scm-gerrit builders: diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index df681dd59..fe827808d 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -169,10 +169,14 @@ fi if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then sudo chmod 666 ${DOVETAIL_CONFIG}/pod.yaml echo "Adapt process info for $INSTALLER_TYPE ..." - attack_process='rabbitmq' + if [ "$INSTALLER_TYPE" == "apex" ]; then + attack_process='rabbitmq_server' + else + attach_process='rabbitmq' + fi cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml process_info: -- {testcase_name: dovetail.ha.tc010, attack_process: ${attack_process}} +- {testcase_name: dovetail.ha.rabbitmq, attack_process: ${attack_process}} EOF echo "file ${DOVETAIL_CONFIG}/pod.yaml:" diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 1df9a554c..cf63bb5a4 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -4,15 +4,16 @@ set -e set +u set +o pipefail +REPO=${REPO:-opnfv} CI_LOOP=${CI_LOOP:-daily} TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources check_os_deployment() { - FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} + FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null - cmd="docker run --rm --privileged=true ${volumes} ${FUNCTEST_IMAGE} check_deployment" + cmd="docker run --rm ${volumes} ${FUNCTEST_IMAGE} check_deployment" echo "Checking deployment, CMD: ${cmd}" eval ${cmd} ret_value=$? @@ -34,10 +35,10 @@ run_tiers() { echo 0 > ${ret_val_file} for tier in ${tiers[@]}; do - FUNCTEST_IMAGE=opnfv/functest-${tier}:${DOCKER_TAG} + FUNCTEST_IMAGE=${REPO}/functest-${tier}:${DOCKER_TAG} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null - cmd="docker run --rm --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'" + cmd="docker run --rm ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'" echo "Running Functest tier '${tier}'. CMD: ${cmd}" eval ${cmd} ret_value=$? @@ -59,17 +60,17 @@ run_test() { # Determine which Functest image should be used for the test case case ${test_name} in connection_check|api_check|snaps_health_check) - FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} ;; - vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|snaps_smoke) - FUNCTEST_IMAGE=opnfv/functest-smoke:${DOCKER_TAG} ;; + FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; + vping_ssh|vping_userdata|cinder_test|tempest_smoke_serial|rally_sanity|refstack_defcore|patrole|odl|snaps_smoke|neutron_trunk) + FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; tempest_full_parallel|rally_full) - FUNCTEST_IMAGE=opnfv/functest-components:${DOCKER_TAG} ;; - cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter) - FUNCTEST_IMAGE=opnfv/functest-vnf:${DOCKER_TAG} ;; - promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds) - FUNCTEST_IMAGE=opnfv/functest-features:${DOCKER_TAG} ;; + FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; + cloudify_ims|vyos_vrouter|juju_epc) + FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; + doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds) + FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; parser-basics) - FUNCTEST_IMAGE=opnfv/functest-parser:${DOCKER_TAG} ;; + FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 @@ -77,7 +78,7 @@ run_test() { esac echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null - cmd="docker run --rm --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'" + cmd="docker run --rm ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'" echo "Running Functest test case '${test_name}'. CMD: ${cmd}" eval ${cmd} ret_value=$? @@ -108,11 +109,6 @@ fi rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" -# Set iptables rule to allow forwarding return traffic for container -if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then - sudo iptables -I FORWARD -j RETURN -fi - echo "Functest: Start Docker and prepare environment" echo "Functest: Download images that will be used by test cases" @@ -173,9 +169,17 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then run_tiers ${tiers} else if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then - tiers=(healthcheck smoke features vnf parser) + if [[ ${BRANCH} == "stable/fraser" ]]; then + tiers=(healthcheck smoke features vnf parser) + else + tiers=(healthcheck smoke features vnf) + fi else - tiers=(healthcheck smoke features parser) + if [[ ${BRANCH} == "stable/fraser" ]]; then + tiers=(healthcheck smoke features parser) + else + tiers=(healthcheck smoke features) + fi fi run_tiers ${tiers} fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 4fc67e7f8..0300b99b2 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -237,7 +237,7 @@ - 'functest-{testsuite}-parameter' - string: name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' + default: 'os-nosdn-nofeature-noha' - string: name: CLEAN_DOCKER_IMAGES default: 'false' @@ -281,25 +281,27 @@ - 'connection_check' - 'api_check' - 'snaps_health_check' - - 'vping_userdata' - 'vping_ssh' + - 'vping_userdata' + - 'cinder_test' - 'tempest_smoke_serial' - 'rally_sanity' + - 'refstack_defcore' + - 'patrole' - 'odl' - - 'odl_netvirt' - 'snaps_smoke' - - 'refstack_defcore' - - 'promise' - - 'doctor' + - 'neutron_trunk' + - 'doctor-notification' - 'bgpvpn' - - 'parser' - - 'security_scan' + - 'functest-odl-sfc' + - 'barometercollectd' + - 'fds' - 'tempest_full_parallel' - 'rally_full' - 'cloudify_ims' - - 'cloudify_vrouter' - - 'orchestra_openims' - - 'orchestra_clearwaterims' + - 'vyos_vrouter' + - 'juju_epc' + - 'parser' default: 'connection_check' - choice: name: FUNCTEST_TIER @@ -309,6 +311,7 @@ - 'features' - 'components' - 'vnf' + - 'parser' default: 'healthcheck' - string: name: TESTCASE_OPTIONS @@ -338,6 +341,10 @@ name: RC_FILE_PATH default: '' description: "Path to the OS credentials file if given" + - string: + name: REPO + default: "opnfv" + description: "Repository name for functest images" ######################## # trigger macros ######################## diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 50c7c3816..74738f280 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -25,6 +25,7 @@ # yamllint disable rule:key-duplicates image: - 'core' + - 'tempest' - 'healthcheck' - 'features' - 'components' @@ -32,6 +33,12 @@ - 'smoke' - 'vnf' + exclude: + - stream: 'master' + image: 'parser' + - stream: 'fraser' + image: 'tempest' + # settings for jobs run in multijob phases build-job-settings: &build-job-settings current-parameters: false @@ -107,6 +114,20 @@ - name: 'functest-core-docker-manifest-{stream}' <<: *manifest-job-settings - multijob: + name: 'build functest-tempest images' + execution-type: PARALLEL + projects: + - name: 'functest-tempest-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-tempest-docker-build-arm64-{stream}' + <<: *build-job-settings + - multijob: + name: 'publish functest-tempest manifests' + execution-type: PARALLEL + projects: + - name: 'functest-tempest-docker-manifest-{stream}' + <<: *manifest-job-settings + - multijob: name: 'build all functest images' condition: SUCCESSFUL execution-type: PARALLEL diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml index 7bfda552d..2a5453658 100644 --- a/jjb/releng/compass4nfv-docker.yaml +++ b/jjb/releng/compass4nfv-docker.yaml @@ -43,7 +43,6 @@ PUSH_IMAGE=$PUSH_IMAGE COMMIT_ID=$COMMIT_ID GERRIT_REFNAME=$GERRIT_REFNAME - DOCKERFILE=$DOCKERFILE kill-phase-on: FAILURE abort-all-jobs: false diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index b7d1ce66f..c73bae371 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -165,6 +165,36 @@ <<: *master <<: *other-receivers # projects with jobs for euphrates + - 'barometer-collectd': + project: 'barometer' + dockerdir: 'docker/barometer-collectd' + <<: *fraser + <<: *other-receivers + - 'barometer-grafana': + project: 'barometer' + dockerdir: 'docker/barometer-grafana' + <<: *fraser + <<: *other-receivers + - 'barometer-influxdb': + project: 'barometer' + dockerdir: 'docker/barometer-influxdb' + <<: *fraser + <<: *other-receivers + - 'barometer-kafka': + project: 'barometer' + dockerdir: 'docker/barometer-kafka' + <<: *fraser + <<: *other-receivers + - 'barometer-ves': + project: 'barometer' + dockerdir: 'docker/barometer-ves' + <<: *fraser + <<: *other-receivers + - 'barometer-snmp': + project: 'barometer' + dockerdir: 'docker/barometer-snmp' + <<: *fraser + <<: *other-receivers - 'bottlenecks': project: 'bottlenecks' <<: *euphrates diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh index 6fa0aef50..b7ff3baa0 100644 --- a/jjb/releng/opnfv-repo-archiver.sh +++ b/jjb/releng/opnfv-repo-archiver.sh @@ -29,7 +29,7 @@ for PROJECT in "${PROJECT_LIST[@]}"; do git clone "https://gerrit.opnfv.org/gerrit/$PROJECT.git" $CLONE_PATH/$PROJECT else pushd "$CLONE_PATH/$PROJECT" &>/dev/null - git pull -f + git pull -f origin master popd &> /dev/null fi diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml index 2230cd56d..baff0c99e 100644 --- a/jjb/xci/xci-verify-jobs.yaml +++ b/jjb/xci/xci-verify-jobs.yaml @@ -20,7 +20,7 @@ unstable: false notbuilt: false - centos: - disabled: false + disabled: true successful: true failed: true unstable: true diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index 4df3f520d..c5a35086f 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -288,7 +288,7 @@ publishers: - email: - recipients: jean.gaoliang@huawei.com limingjiang@huawei.com ross.b.brattain@intel.com + recipients: jean.gaoliang@huawei.com limingjiang@huawei.com - email-jenkins-admins-on-failure ######################## diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index a87e399dd..9debb45b7 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -21,14 +21,14 @@ dir_result="${HOME}/opnfv/$project/results/${branch}" # src: https://wiki.opnfv.org/display/INF/Hardware+Infrastructure # + intel-pod12 (vsperf) node_list=(\ -'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod12' \ +'lf-pod1' 'lf-pod2' \ 'lf-virtual2' 'lf-virtual3' \ -'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' 'intel-pod18' \ +'intel-pod12' 'intel-pod18' \ 'ericsson-pod1' 'ericsson-pod2' \ 'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ -'ericsson-virtual4' 'ericsson-virtual5' 'ericsson-virtual12' \ -'arm-pod1' 'arm-pod5' 'arm-pod6' \ -'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' 'huawei-pod5' \ +'ericsson-virtual4' 'ericsson-virtual5' \ +'arm-pod5' 'arm-pod6' \ +'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' \ 'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \ 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \ 'huawei-virtual5' 'huawei-virtual8' 'huawei-virtual9' \ |