diff options
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 88 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 171 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 29 | ||||
| -rwxr-xr-x | jjb/functest/functest-k8.sh | 29 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-docker.yaml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yaml | 104 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 28 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 106 | ||||
| -rw-r--r-- | jjb/functest/functest-weekly-jobs.yaml | 128 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 80 | ||||
| -rw-r--r-- | jjb/functest/xtesting-docker.yaml | 6 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yaml | 104 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 21 |
13 files changed, 155 insertions, 745 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8c29249e1..4f3c9ef98 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -10,23 +10,6 @@ TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} -check_os_deployment() { - 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 ${volumes} ${FUNCTEST_IMAGE} check_deployment" - echo "Checking deployment, CMD: ${cmd}" - eval ${cmd} - ret_value=$? - if [ ${ret_value} != 0 ]; then - echo "ERROR: Problem while checking OpenStack deployment." - exit 1 - else - echo "OpenStack deployment OK." - fi - -} - run_tiers() { tiers=$1 cmd_opt="run_tests -r -t all" @@ -122,7 +105,8 @@ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(ca envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE} -e CI_LOOP=${CI_LOOP} \ - -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL}" + -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL} \ + -e DEBUG=true" ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" @@ -173,12 +157,15 @@ apex) compute-feature-enabled: shelve: false vnc_console: true + block_migration_for_live_migration: false identity-feature-enabled: api_v2: false api_v2_admin: false image-feature-enabled: api_v2: true api_v1: false +object-storage: + operator_role: SwiftOperator volume: storage_protocol: ceph volume-feature-enabled: @@ -191,6 +178,7 @@ compass) compute-feature-enabled: shelve: false vnc_console: false + block_migration_for_live_migration: false spice_console: true identity-feature-enabled: api_v2: false @@ -242,12 +230,62 @@ volume-feature-enabled: EOF ;; esac +case ${BRANCH} in +master) + cat << EOF >> "${tempest_conf_yaml}" +compute: + max_microversion: latest +EOF + ;; +stable/hunter) + cat << EOF >> "${tempest_conf_yaml}" +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}" volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \ ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \ -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml" +if [[ ${INSTALLER_TYPE} == 'apex' ]]; then + blacklist_yaml=$(mktemp) + cat << EOF >> "${blacklist_yaml}" +--- +- + scenarios: + - os-ovn-nofeature-ha + tests: + - neutron_tempest_plugin.api.admin.test_agent_management + - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler + - patrole_tempest_plugin.tests.api.network.test_agents_rbac + - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type + - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id + - tempest.api.network.admin.test_agent_management + - tempest.api.network.admin.test_dhcp_agent_scheduler + - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy +- + scenarios: + - os-nosdn-nofeature-ha + tests: + - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy +- + scenarios: + - os-nosdn-nofeature-noha + tests: + - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy +EOF + volumes="${volumes} -v ${blacklist_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml" +fi + ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -263,21 +301,15 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then else tests=() skip_tests=0 - if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then - if [[ ${BRANCH} == "stable/fraser" ]]; then - tiers=(healthcheck smoke features vnf parser) - tests=(tempest_full_parallel) - elif [[ ${BRANCH} == "stable/gambia" ]]; then + 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 else - if [[ ${BRANCH} == "stable/fraser" ]]; then - tiers=(healthcheck smoke features parser) - tests=(tempest_full_parallel) - elif [[ ${BRANCH} == "stable/gambia" ]]; then - tiers=(healthcheck smoke benchmarking features vnf components) + if [[ ${BRANCH} == "stable/gambia" ]]; then + tiers=(healthcheck smoke benchmarking features components) else tiers=(healthcheck smoke benchmarking features) fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 34aee8a9d..1a94d5140 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -14,10 +14,6 @@ stream: master branch: '{stream}' gs-pathname: '' - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' gambia: &gambia stream: gambia branch: 'stable/{stream}' @@ -47,73 +43,20 @@ - baremetal: slave-label: fuel-baremetal installer: fuel - <<: *gambia - - virtual: - slave-label: fuel-virtual - installer: fuel - <<: *gambia - - baremetal: - slave-label: fuel-baremetal - installer: fuel - <<: *fraser + <<: *hunter - virtual: slave-label: fuel-virtual installer: fuel - <<: *fraser - # joid CI PODs - - baremetal: - slave-label: joid-baremetal - installer: joid - <<: *master - - virtual: - slave-label: joid-virtual - installer: joid - <<: *master - - baremetal: - slave-label: joid-baremetal - installer: joid - <<: *fraser - - virtual: - slave-label: joid-virtual - installer: joid - <<: *fraser + <<: *hunter # compass CI PODs - baremetal: slave-label: compass-baremetal installer: compass - <<: *master - - virtual: - slave-label: compass-virtual - installer: compass - <<: *master - - arm-virtual: - slave-label: compass-arm-virtual - installer: compass - <<: *master - - baremetal: - slave-label: compass-baremetal - installer: compass - <<: *fraser - - virtual: - slave-label: compass-virtual - installer: compass - <<: *fraser - - arm-virtual: - slave-label: compass-arm-virtual - installer: compass - <<: *fraser - - baremetal: - slave-label: compass-baremetal - installer: compass <<: *gambia - virtual: slave-label: compass-virtual installer: compass <<: *gambia - - arm-virtual: - slave-label: compass-arm-virtual - installer: compass - <<: *gambia # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -131,123 +74,15 @@ slave-label: apex-baremetal-master installer: apex <<: *gambia - - virtual: - slave-label: apex-virtual-fraser - installer: apex - <<: *fraser - - baremetal: - slave-label: apex-baremetal-fraser - installer: apex - <<: *fraser # armband CI PODs - armband-baremetal: slave-label: armband-baremetal installer: fuel <<: *master - - armband-virtual: - slave-label: armband-virtual - installer: fuel - <<: *master - - armband-baremetal: - slave-label: armband-baremetal - installer: fuel - <<: *gambia - - armband-virtual: - slave-label: armband-virtual - installer: fuel - <<: *gambia - armband-baremetal: slave-label: armband-baremetal installer: fuel - <<: *fraser - - armband-virtual: - slave-label: armband-virtual - installer: fuel - <<: *fraser - # daisy CI PODs - - baremetal: - slave-label: daisy-baremetal - installer: daisy - <<: *master - - virtual: - slave-label: daisy-virtual - installer: daisy - <<: *master - - baremetal: - slave-label: daisy-baremetal - installer: daisy - <<: *fraser - - virtual: - slave-label: daisy-virtual - installer: daisy - <<: *fraser - # netvirt 3rd party ci - - virtual: - slave-label: odl-netvirt-virtual - installer: netvirt - <<: *master - # ------------------------------- - # None-CI PODs - # ------------------------------- - - orange-pod1: - slave-label: '{pod}' - installer: joid - <<: *master - - orange-pod5: - slave-label: '{pod}' - installer: fuel - <<: *master - - orange-pod2: - slave-label: '{pod}' - installer: joid - <<: *master - - baremetal-centos: - slave-label: 'intel-pod8' - installer: compass - <<: *master - - nokia-pod1: - slave-label: '{pod}' - installer: apex - <<: *master - - zte-pod1: - slave-label: '{pod}' - installer: fuel - <<: *master - - zte-pod1: - slave-label: '{pod}' - installer: fuel - <<: *fraser - - zte-pod2: - slave-label: '{pod}' - installer: daisy - <<: *master - - zte-pod2: - slave-label: '{pod}' - installer: daisy - <<: *fraser - - zte-pod3: - slave-label: '{pod}' - installer: daisy - <<: *master - - zte-pod3: - slave-label: '{pod}' - installer: daisy - <<: *fraser - - zte-pod9: - slave-label: '{pod}' - installer: daisy - <<: *master - - zte-pod9: - slave-label: '{pod}' - installer: daisy - <<: *fraser - # ------------------------------- - # PODs for verify jobs triggered by each patch upload - # - ool-virtual1: - # slave-label: '{pod}' - # installer: apex - # <<: *master - # ------------------------------- + <<: *hunter testsuite: - 'suite': diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 71215cae1..328ef7c6c 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -12,13 +12,13 @@ - master: branch: '{stream}' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' disabled: false @@ -35,7 +35,6 @@ - 'healthcheck' - 'features' - 'components' - - 'parser' - 'smoke' - 'benchmarking' - 'vnf' @@ -43,18 +42,10 @@ exclude: - stream: 'master' image: 'components' - - stream: 'hunter' + - stream: 'iruya' image: 'components' - - stream: 'master' - image: 'parser' - stream: 'hunter' - image: 'parser' - - stream: 'gambia' - image: 'parser' - - stream: 'fraser' - image: 'tempest' - - stream: 'fraser' - image: 'benchmarking' + image: 'components' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -161,10 +152,6 @@ <<: *build-job-settings - name: 'functest-components-docker-build-arm64-{stream}' <<: *build-job-settings - - name: 'functest-parser-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-parser-docker-build-arm64-{stream}' - <<: *build-job-settings - name: 'functest-smoke-docker-build-amd64-{stream}' <<: *build-job-settings - name: 'functest-smoke-docker-build-arm64-{stream}' @@ -188,8 +175,6 @@ <<: *manifest-job-settings - name: 'functest-components-docker-manifest-{stream}' <<: *manifest-job-settings - - name: 'functest-parser-docker-manifest-{stream}' - <<: *manifest-job-settings - name: 'functest-smoke-docker-manifest-{stream}' <<: *manifest-job-settings - name: 'functest-benchmarking-docker-manifest-{stream}' @@ -217,9 +202,9 @@ #!/bin/bash -ex case "{arch_tag}" in "arm64") - sudo amd64_dirs= arm64_dirs=docker/{image} bash ./build.sh ;; + sudo amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;; *) - sudo amd64_dirs=docker/{image} arm64_dirs= bash ./build.sh ;; + sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;; esac exit $? diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 419c4e051..4543f7f01 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -4,41 +4,24 @@ set -e set +u set +o pipefail -[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" +redirect="/dev/stdout" FUNCTEST_DIR=/home/opnfv/functest -rc_file=${HOME}/k8.creds -sudo rm -rf $rc_file - -if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" - echo "export KUBERNETES_PROVIDER=local" >> $rc_file - KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}') - echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file - KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2') - echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file -elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then - admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config" - rc_file=${HOME}/joid_config/k8config -else - echo "Not supported by other installers yet" - exit 1 -fi - -rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" +admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" +cat ${HOME}/admin.conf dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* results_vol="-v ${dir_result}:${FUNCTEST_DIR}/results" -volumes="${rc_file_vol} ${results_vol} ${admin_conf_file_vol}" +volumes="${results_vol} ${admin_conf_file_vol}" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE}" + -e BUILD_TAG=${BUILD_TAG}" -DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}` +DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} set +e diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index c328f5d86..c70aae35b 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -12,13 +12,13 @@ - master: branch: '{stream}' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 46b77ce68..161469bce 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -11,22 +11,21 @@ jobs: - 'functest-kubernetes-verify-{stream}' - 'functest-kubernetes-verify-{phase}-{stream}' - - 'functest-kubernetes-docs-upload-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false - - hunter: &hunter + - iruya: &iruya branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia + - hunter: &hunter branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -34,10 +33,6 @@ phase: - 'unit-tests-and-docs': slave-label: 'opnfv-build-ubuntu' - - 'build-x86_64': - slave-label: 'opnfv-build-ubuntu' - - 'build-aarch64': - slave-label: 'opnfv-build-ubuntu-arm' - job-template: name: 'functest-kubernetes-verify-{stream}' @@ -81,30 +76,6 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: false - - name: 'functest-kubernetes-verify-build-x86_64-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - ARCH=x86_64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - - name: 'functest-kubernetes-verify-build-aarch64-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - ARCH=aarch64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - job-template: name: 'functest-kubernetes-verify-{phase}-{stream}' @@ -131,28 +102,6 @@ publishers: - 'functest-kubernetes-verify-{phase}-publishers-macro' -- job-template: - name: 'functest-kubernetes-docs-upload-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - 'functest-kubernetes-docs-upload-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - functest-kubernetes-upload-doc-artifact - ################################ # job triggers ################################ @@ -182,25 +131,6 @@ - compare-type: ANT pattern: 'docs/**|.gitignore' -- trigger: - name: 'functest-kubernetes-docs-upload-triggers-macro' - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' ################################ # job builders ################################ @@ -211,24 +141,6 @@ - shell: | cd $WORKSPACE && tox -- builder: - name: 'functest-kubernetes-verify-build-x86_64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-kubernetes-verify-build-aarch64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-kubernetes-upload-doc-artifact' - builders: - - shell: | - cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs" ################################ # job publishers ################################ @@ -253,13 +165,3 @@ unhealthy: 40 failing: 30 - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-kubernetes-verify-build-x86_64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-kubernetes-verify-build-aarch64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 338363cde..628b06ee3 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -8,12 +8,10 @@ repo: 'opnfv' port: tag: - - latest: - branch: master + - iruya: + branch: stable/iruya - hunter: branch: stable/hunter - - gambia: - branch: stable/gambia - parameter: name: functest-kubernetes-slave @@ -238,7 +236,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -303,20 +301,20 @@ ref: $branch - project: - name: 'functest-kubernetes-_-golang-alpine3.8-rmi' + name: 'functest-kubernetes-_-golang-alpine3.9-rmi' repo: _ port: container: golang - tag: alpine3.8 + tag: alpine3.9 jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-kubernetes-_-golang-alpine3.8-pull' + name: 'functest-kubernetes-_-golang-alpine3.9-pull' repo: _ port: container: golang - tag: alpine3.8 + tag: alpine3.9 jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-pull' @@ -372,7 +370,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -386,12 +384,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-rmi' + - name: 'functest-kubernetes-_-golang-alpine3.9-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-pull' + - name: 'functest-kubernetes-_-golang-alpine3.9-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core @@ -464,7 +462,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -478,12 +476,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-rmi' + - name: 'functest-kubernetes-_-golang-alpine3.9-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-pull' + - name: 'functest-kubernetes-_-golang-alpine3.9-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index e9a65b495..405202ecd 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -11,33 +11,28 @@ jobs: - 'functest-verify-{stream}' - 'functest-verify-{phase}-{stream}' - - 'functest-docs-upload-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' gs-pathname: '' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: branch: 'stable/{stream}' - gs-pathname: '/{stream}' + gs-pathname: '' disabled: false phase: - 'unit-tests-and-docs': slave-label: 'opnfv-build-ubuntu' - - 'build-x86_64': - slave-label: 'opnfv-build-ubuntu' - - 'build-aarch64': - slave-label: 'opnfv-build-ubuntu-arm' - job-template: name: 'functest-verify-{stream}' @@ -81,30 +76,6 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: false - - name: 'functest-verify-build-x86_64-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - ARCH=x86_64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - - name: 'functest-verify-build-aarch64-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - ARCH=aarch64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - job-template: name: 'functest-verify-{phase}-{stream}' @@ -131,28 +102,6 @@ publishers: - 'functest-verify-{phase}-publishers-macro' -- job-template: - name: 'functest-docs-upload-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - 'functest-docs-upload-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - functest-upload-doc-artifact - ################################ # job triggers ################################ @@ -182,25 +131,6 @@ - compare-type: ANT pattern: 'docs/**|.gitignore' -- trigger: - name: 'functest-docs-upload-triggers-macro' - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' ################################ # job builders ################################ @@ -211,24 +141,6 @@ - shell: | cd $WORKSPACE && tox -- builder: - name: 'functest-verify-build-x86_64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-verify-build-aarch64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-upload-doc-artifact' - builders: - - shell: | - cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/build" "docs" ################################ # job publishers ################################ @@ -253,13 +165,3 @@ unhealthy: 40 failing: 30 - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-verify-build-x86_64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-verify-build-aarch64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure diff --git a/jjb/functest/functest-weekly-jobs.yaml b/jjb/functest/functest-weekly-jobs.yaml deleted file mode 100644 index c88fa0050..000000000 --- a/jjb/functest/functest-weekly-jobs.yaml +++ /dev/null @@ -1,128 +0,0 @@ ---- -################################### -# job configuration for functest -################################### -- project: - name: functest-weekly - - project: functest - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - disabled: false - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - docker-tag: '{stream}' - disabled: false - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # Installers using labels - # CI PODs - # This section should only contain the installers - # that have been switched using labels for slaves - # ------------------------------- - pod: - # fuel CI PODs - - baremetal: - slave-label: fuel-baremetal - installer: fuel - <<: *master - - virtual: - slave-label: fuel-virtual - installer: fuel - <<: *master - - baremetal: - slave-label: fuel-baremetal - installer: fuel - <<: *fraser - - virtual: - slave-label: fuel-virtual - installer: fuel - <<: *fraser - # ------------------------------- - jobs: - - 'functest-{installer}-{pod}-weekly-{stream}' - -################################ -# job template -################################ -- job-template: - name: 'functest-{installer}-{pod}-weekly-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - wrappers: - - build-name: - name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: '400' - abort: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults' - - string: - name: FUNCTEST_SUITE_NAME - default: 'weekly' - description: "Weekly suite name to run" - - string: - name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull docker image' - - string: - name: CLEAN_DOCKER_IMAGES - default: 'false' - description: 'Remove downloaded docker images (opnfv/functest*:*)' - - functest-parameter: - gs-pathname: '{gs-pathname}' - - scm: - - git-scm - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - 'functest-weekly-builder' -######################## -# builder macros -######################## -- builder: - name: functest-weekly-builder - builders: - - shell: - !include-raw: ./functest-cleanup.sh - # yamllint disable rule:indentation - - shell: - !include-raw: - - ./functest-env-presetup.sh - - ../../utils/fetch_os_creds.sh - - ./functest-alpine.sh - # yamllint enable rule:indentation - - shell: - !include-raw: ../../utils/push-test-logs.sh - - shell: - !include-raw: ./functest-exit.sh diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 129391545..074ad737b 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -10,15 +10,20 @@ tag: - latest: branch: master + slave: lf-virtual9 + - iruya: + branch: stable/iruya + slave: lf-virtual4 - hunter: branch: stable/hunter + slave: lf-virtual6 - parameter: name: functest-slave parameters: - label: name: slave - default: functest-virtual + default: '{slave}' - parameter: name: functest-branch @@ -96,9 +101,13 @@ fi sudo docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ + -e DEBUG=true \ -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/\ + site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ @@ -134,7 +143,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-pull' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-pull-containers: <<: *functest-containers @@ -177,7 +187,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-rmi' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-remove-images: <<: *functest-containers @@ -220,7 +231,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-{test}-run' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-run-containers: <<: *functest-run-containers @@ -241,8 +253,6 @@ - vping_userdata - cinder_test - odl - - api_check - - snaps_health_check - tempest_smoke jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -258,7 +268,6 @@ - tempest_full - tempest_scenario - patrole - - snaps_smoke - neutron_trunk - networking-bgpvpn - networking-sfc @@ -310,13 +319,14 @@ triggers: - timed: '@daily' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -369,10 +379,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs - multijob: @@ -390,8 +396,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -442,7 +446,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-gate' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' scm: - functest-scm: ref: $GERRIT_REFSPEC @@ -454,7 +459,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-check' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' - functest-branch: branch: '{branch}' scm: @@ -466,20 +472,22 @@ ref: $branch - project: - name: 'functest-_-alpine-3.8-rmi' + name: 'functest-_-alpine-3.9-rmi' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 + slave: master jobs: - 'functest-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-_-alpine-3.8-pull' + name: 'functest-_-alpine-3.9-pull' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 + slave: master jobs: - 'functest-{repo}-{container}-{tag}-pull' @@ -557,7 +565,8 @@ name: 'functest-{tag}-check' project-type: multijob parameters: - - functest-slave + - functest-slave: + slave: '{slave}' - functest-branch: branch: '{branch}' properties: @@ -565,7 +574,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -583,12 +592,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.8-rmi' + - name: 'functest-_-alpine-3.9-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.8-pull' + - name: 'functest-_-alpine-3.9-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -638,10 +647,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs - multijob: @@ -659,8 +664,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -738,13 +741,14 @@ - functest-patchset-created: branch: '{branch}' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -762,12 +766,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.8-rmi' + - name: 'functest-_-alpine-3.9-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.8-pull' + - name: 'functest-_-alpine-3.9-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -817,10 +821,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs - multijob: @@ -838,8 +838,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index 88416bbf9..4847bbd9c 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -12,13 +12,13 @@ - master: branch: '{stream}' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index 239ae9f9b..830740151 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -11,22 +11,21 @@ jobs: - 'xtesting-verify-{stream}' - 'xtesting-verify-{phase}-{stream}' - - 'xtesting-docs-upload-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false - - hunter: &hunter + - iruya: &iruya branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia + - hunter: &hunter branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -34,10 +33,6 @@ phase: - 'unit-tests-and-docs': slave-label: 'opnfv-build-ubuntu' - - 'build-x86_64': - slave-label: 'opnfv-build-ubuntu' - - 'build-aarch64': - slave-label: 'opnfv-build-ubuntu-arm' - job-template: name: 'xtesting-verify-{stream}' @@ -81,30 +76,6 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: false - - name: 'xtesting-verify-build-x86_64-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - ARCH=x86_64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - - name: 'xtesting-verify-build-aarch64-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - ARCH=aarch64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - job-template: name: 'xtesting-verify-{phase}-{stream}' @@ -131,28 +102,6 @@ publishers: - 'xtesting-verify-{phase}-publishers-macro' -- job-template: - name: 'xtesting-docs-upload-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - 'xtesting-docs-upload-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - xtesting-upload-doc-artifact - ################################ # job triggers ################################ @@ -182,25 +131,6 @@ - compare-type: ANT pattern: 'docs/**|.gitignore' -- trigger: - name: 'xtesting-docs-upload-triggers-macro' - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' ################################ # job builders ################################ @@ -211,24 +141,6 @@ - shell: | cd $WORKSPACE && tox -- builder: - name: 'xtesting-verify-build-x86_64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'xtesting-verify-build-aarch64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'xtesting-upload-doc-artifact' - builders: - - shell: | - cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs" ################################ # job publishers ################################ @@ -253,13 +165,3 @@ unhealthy: 40 failing: 30 - email-jenkins-admins-on-failure - -- publisher: - name: 'xtesting-verify-build-x86_64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure - -- publisher: - name: 'xtesting-verify-build-aarch64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 3f86b0530..48c0952cc 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -10,10 +10,10 @@ tag: - latest: branch: master + - iruya: + branch: stable/iruya - hunter: branch: stable/hunter - - gambia: - branch: stable/gambia - parameter: name: xtesting-slave @@ -98,6 +98,7 @@ fi sudo docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -e DEBUG=true \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ @@ -246,20 +247,20 @@ ref: $branch - project: - name: 'xtesting-_-alpine-3.8-rmi' + name: 'xtesting-_-alpine-3.9-rmi' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 jobs: - 'xtesting-{repo}-{container}-{tag}-rmi' - project: - name: 'xtesting-_-alpine-3.8-pull' + name: 'xtesting-_-alpine-3.9-pull' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 jobs: - 'xtesting-{repo}-{container}-{tag}-pull' @@ -295,12 +296,12 @@ - multijob: name: remove dependencies projects: - - name: 'xtesting-_-alpine-3.8-rmi' + - name: 'xtesting-_-alpine-3.9-rmi' <<: *xtesting-jobs - multijob: name: pull dependencies projects: - - name: 'xtesting-_-alpine-3.8-pull' + - name: 'xtesting-_-alpine-3.9-pull' <<: *xtesting-jobs - multijob: name: opnfv/functest-xtesting @@ -367,12 +368,12 @@ - multijob: name: remove dependencies projects: - - name: 'xtesting-_-alpine-3.8-rmi' + - name: 'xtesting-_-alpine-3.9-rmi' <<: *xtesting-jobs - multijob: name: pull dependencies projects: - - name: 'xtesting-_-alpine-3.8-pull' + - name: 'xtesting-_-alpine-3.9-pull' <<: *xtesting-jobs - multijob: name: opnfv/functest-xtesting |