diff options
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yaml | 82 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 20 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 21 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-rtd-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 36 | ||||
| -rw-r--r-- | jjb/functest/xtesting-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/nfvbench/nfvbench.yaml | 5 | ||||
| -rw-r--r-- | jjb/releng/releng-release-create-venv.sh | 3 | ||||
| -rw-r--r-- | releases/hunter/storperf.yaml | 9 |
14 files changed, 36 insertions, 163 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index abbffb2af..d45a2eabb 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -21,14 +21,8 @@ gs-pathname: '' docker-tag: 'latest' disabled: true - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - dovetail-branch: 'stable/{stream}' - gs-pathname: '/{stream}' - docker-tag: 'ovp-2.0.0' - gambia: &gambia - stream: gambia + hunter: &hunter + stream: hunter branch: 'stable/{stream}' dovetail-branch: 'master' gs-pathname: '/{stream}' @@ -61,22 +55,12 @@ slave-label: fuel-baremetal SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: fuel-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: fuel-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - virtual: slave-label: fuel-virtual SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # compass CI PODs - baremetal: slave-label: compass-baremetal @@ -92,22 +76,12 @@ slave-label: compass-baremetal SUT: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - virtual: slave-label: compass-virtual SUT: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # ------------------------------- # Installers not using labels # CI PODs @@ -129,22 +103,12 @@ slave-label: apex-virtual-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: apex-baremetal-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: apex-virtual-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - baremetal: slave-label: apex-baremetal-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -156,16 +120,6 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - armband-baremetal: - slave-label: armband-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - armband-virtual: - slave-label: armband-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser # ------------------------------- # None-CI PODs # ------------------------------- @@ -189,26 +143,6 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - zte-pod1: - slave-label: zte-pod1 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - zte-pod3: - slave-label: zte-pod3 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - huawei-pod4: - slave-label: huawei-pod4 - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - huawei-pod7: - slave-label: huawei-pod7 - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser # ------------------------------- testsuite: diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 4f3c9ef98..37189f84a 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -114,7 +114,7 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi" - envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e BLOCK_MIGRATION=false" fi if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then @@ -243,12 +243,6 @@ compute: max_microversion: 2.65 EOF ;; -stable/gambia) - cat << EOF >> "${tempest_conf_yaml}" -compute: - max_microversion: 2.60 -EOF - ;; esac echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}" @@ -302,17 +296,9 @@ else tests=() skip_tests=0 if [ "${HOST_ARCH}" != "aarch64" ]; then - if [[ ${BRANCH} == "stable/gambia" ]]; then - tiers=(healthcheck smoke benchmarking features vnf components) - else - tiers=(healthcheck smoke benchmarking features vnf) - fi + tiers=(healthcheck smoke benchmarking features vnf) else - if [[ ${BRANCH} == "stable/gambia" ]]; then - tiers=(healthcheck smoke benchmarking features components) - else - tiers=(healthcheck smoke benchmarking features) - fi + tiers=(healthcheck smoke benchmarking features) fi run_tiers ${tiers} if [ ${skip_tests} -eq 0 ]; then diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index aefc214cc..e1f15fd93 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -14,8 +14,8 @@ stream: master branch: '{stream}' gs-pathname: '' - gambia: &gambia - stream: gambia + iruya: &iruya + stream: iruya branch: 'stable/{stream}' gs-pathname: '/{stream}' hunter: &hunter @@ -48,15 +48,6 @@ slave-label: fuel-virtual installer: fuel <<: *hunter - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - installer: compass - <<: *gambia - - virtual: - slave-label: compass-virtual - installer: compass - <<: *gambia # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -74,14 +65,6 @@ slave-label: apex-baremetal-master installer: apex <<: *hunter - - virtual: - slave-label: apex-virtual-master - installer: apex - <<: *gambia - - baremetal: - slave-label: apex-baremetal-master - installer: apex - <<: *gambia # armband CI PODs - armband-baremetal: slave-label: armband-baremetal diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 328ef7c6c..561296000 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -18,9 +18,6 @@ - hunter: branch: 'stable/{stream}' disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false arch_tag: - 'amd64': diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index c70aae35b..c8c55e742 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -18,9 +18,6 @@ - hunter: branch: 'stable/{stream}' disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false arch_tag: - 'amd64': diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 161469bce..178df6a9e 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -25,10 +25,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false phase: - 'unit-tests-and-docs': diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index 405202ecd..69df265dc 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -25,10 +25,6 @@ branch: 'stable/{stream}' gs-pathname: '' disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '' - disabled: false phase: - 'unit-tests-and-docs': diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml index b145ca7c2..8d20dd20e 100644 --- a/jjb/functest/functest-rtd-jobs.yaml +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -16,7 +16,7 @@ - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 4a60c6484..8fe365958 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -99,14 +99,21 @@ else image={repo}:{port}/{container}:{tag} fi + if [ "{tag}" = "latest" ]; then + py=3.6 + else + py=2.7 + fi sudo docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ - -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\ + -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\ site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ + -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\ + site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ @@ -369,8 +376,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -398,8 +403,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} - execution-type: PARALLEL - condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -429,8 +432,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -443,7 +444,6 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY - condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -457,8 +457,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs @@ -652,8 +650,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -681,8 +677,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} - execution-type: PARALLEL - condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -712,8 +706,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -726,7 +718,6 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY - condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -740,8 +731,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs @@ -841,8 +830,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -870,8 +857,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} - execution-type: PARALLEL - condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -901,8 +886,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -915,7 +898,6 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY - condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -929,8 +911,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index 4847bbd9c..510a55ea3 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -18,9 +18,6 @@ - hunter: branch: 'stable/{stream}' disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false arch_tag: - 'amd64': diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index 830740151..39e73b719 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -25,10 +25,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false phase: - 'unit-tests-and-docs': diff --git a/jjb/nfvbench/nfvbench.yaml b/jjb/nfvbench/nfvbench.yaml index ec6776f81..a9efb272a 100644 --- a/jjb/nfvbench/nfvbench.yaml +++ b/jjb/nfvbench/nfvbench.yaml @@ -44,8 +44,7 @@ - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: - - comment-added-contains-event: - comment-contains-value: 'buildvm' + - change-merged-event projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -96,3 +95,5 @@ builders: - shell: | cd $WORKSPACE && tox + cd $WORKSPACE/nfvbenchvm/dib + bash verify-image.sh -v diff --git a/jjb/releng/releng-release-create-venv.sh b/jjb/releng/releng-release-create-venv.sh index de585fdb3..0200376a7 100644 --- a/jjb/releng/releng-release-create-venv.sh +++ b/jjb/releng/releng-release-create-venv.sh @@ -11,7 +11,8 @@ set -e -o pipefail echo "---> Create virtualenv" sudo -H pip install virtualenv -virtualenv $WORKSPACE/venv +virtualenv -p /usr/bin/python3 $WORKSPACE/venv + # shellcheck source=$WORKSPACE/venv/bin/activate disable=SC1091 source $WORKSPACE/venv/bin/activate pip install --upgrade pip diff --git a/releases/hunter/storperf.yaml b/releases/hunter/storperf.yaml new file mode 100644 index 000000000..6abe0f241 --- /dev/null +++ b/releases/hunter/storperf.yaml @@ -0,0 +1,9 @@ +--- +project: storperf +project-type: testing +release-model: stable + +branches: + - name: stable/hunter + location: + storperf: cc15a771fa60ddd63ac0a7eee3b43eb9f8cf2334 |