diff options
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 7 | ||||
| -rwxr-xr-x | jjb/functest/functest-k8.sh | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-docker.yaml | 7 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 67 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 88 |
7 files changed, 3 insertions, 181 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 37189f84a..ae57258bc 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -46,8 +46,6 @@ run_test() { FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; - doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os) - FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 @@ -296,9 +294,9 @@ else tests=() skip_tests=0 if [ "${HOST_ARCH}" != "aarch64" ]; then - tiers=(healthcheck smoke benchmarking features vnf) + tiers=(healthcheck smoke benchmarking vnf) else - tiers=(healthcheck smoke benchmarking features) + tiers=(healthcheck smoke benchmarking) 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 e1f15fd93..3f5e7fd12 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -184,11 +184,6 @@ - 'shaker' - 'vmtp' - 'neutron_trunk' - - 'doctor-notification' - - 'bgpvpn' - - 'functest-odl-sfc' - - 'barometercollectd' - - 'fds' - 'tempest_full' - 'rally_full' - 'cloudify_ims' @@ -202,7 +197,6 @@ - 'healthcheck' - 'smoke' - 'benchmarking' - - 'features' - 'components' - 'vnf' - 'parser' diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 25ca03ab3..bb25c0f3c 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -30,7 +30,6 @@ - 'core' - 'tempest' - 'healthcheck' - - 'features' - 'smoke' - 'benchmarking' - 'vnf' @@ -136,10 +135,6 @@ <<: *build-job-settings - name: 'functest-healthcheck-docker-build-arm64-{stream}' <<: *build-job-settings - - name: 'functest-features-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-features-docker-build-arm64-{stream}' - <<: *build-job-settings - name: 'functest-smoke-docker-build-amd64-{stream}' <<: *build-job-settings - name: 'functest-smoke-docker-build-arm64-{stream}' @@ -159,8 +154,6 @@ projects: - name: 'functest-healthcheck-docker-manifest-{stream}' <<: *manifest-job-settings - - name: 'functest-features-docker-manifest-{stream}' - <<: *manifest-job-settings - name: 'functest-smoke-docker-manifest-{stream}' <<: *manifest-job-settings - name: 'functest-benchmarking-docker-manifest-{stream}' diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 4543f7f01..fb0e95526 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -30,8 +30,7 @@ echo 0 > ${ret_val_file} FUNCTEST_IMAGES="\ opnfv/functest-kubernetes-healthcheck:${DOCKER_TAG} \ -opnfv/functest-kubernetes-smoke:${DOCKER_TAG} \ -opnfv/functest-kubernetes-features:${DOCKER_TAG}" +opnfv/functest-kubernetes-smoke:${DOCKER_TAG}" cmd_opt="run_tests -r -t all" for image in ${FUNCTEST_IMAGES}; do diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index c8c55e742..6c82904a0 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -29,7 +29,6 @@ image: - 'core' - 'healthcheck' - - 'features' - 'smoke' # settings for jobs run in multijob phases @@ -125,10 +124,6 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'functest-kubernetes-features-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-kubernetes-features-docker-build-arm64-{stream}' - <<: *build-job-settings - name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}' <<: *build-job-settings - name: 'functest-kubernetes-smoke-docker-build-arm64-{stream}' @@ -138,8 +133,6 @@ condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'functest-kubernetes-features-docker-manifest-{stream}' - <<: *manifest-job-settings - name: 'functest-kubernetes-smoke-docker-manifest-{stream}' <<: *manifest-job-settings diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index d628117d1..bd98042a7 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -158,13 +158,6 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-pull' -- project: - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-pull' - <<: *functest-kubernetes-params - container: 'functest-kubernetes-features' - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-pull' - - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi' parameters: @@ -188,13 +181,6 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' -- project: - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-rmi' - <<: *functest-kubernetes-params - container: 'functest-kubernetes-features' - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' - - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' parameters: @@ -228,16 +214,6 @@ - tag: hunter test: xrally_kubernetes -- project: - name: 'functest-kubernetes-opnfv-functest-kubernetes-features' - <<: *functest-kubernetes-params - container: 'functest-kubernetes-features' - test: - - stor4nfv_k8s - - clover_k8s - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' - - job-template: name: 'functest-kubernetes-{tag}-daily' project-type: multijob @@ -260,8 +236,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi' - <<: *functest-kubernetes-jobs - multijob: name: pull containers projects: @@ -269,8 +243,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-pull' - <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-healthcheck:{tag} projects: @@ -284,13 +256,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - - multijob: - name: opnfv/functest-kubernetes-features:{tag} - projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run' - <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run' - <<: *functest-kubernetes-jobs - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-gate' @@ -370,16 +335,6 @@ - 'functest-kubernetes-{repo}-{container}-{tag}-gate' - 'functest-kubernetes-{repo}-{container}-{tag}-check' -- project: - name: functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-build - <<: *functest-kubernetes-params - container: functest-kubernetes-features - ref_arg: - path: docker/features - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-gate' - - 'functest-kubernetes-{repo}-{container}-{tag}-check' - - job-template: name: 'functest-kubernetes-{tag}-check' project-type: multijob @@ -402,8 +357,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi' - <<: *functest-kubernetes-jobs - multijob: name: remove dependencies projects: @@ -429,8 +382,6 @@ projects: - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-check' - <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-healthcheck:{tag} projects: @@ -444,13 +395,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - - multijob: - name: opnfv/functest-kubernetes-features:{tag} - projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run' - <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run' - <<: *functest-kubernetes-jobs - trigger: name: functest-kubernetes-patchset-created @@ -498,8 +442,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi' - <<: *functest-kubernetes-jobs - multijob: name: remove dependencies projects: @@ -525,8 +467,6 @@ projects: - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-gate' - <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-healthcheck:{tag} projects: @@ -540,13 +480,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - - multijob: - name: opnfv/functest-kubernetes-features:{tag} - projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run' - <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run' - <<: *functest-kubernetes-jobs - project: name: 'functest-kubernetes' diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index f340bd371..05d2892bd 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -184,13 +184,6 @@ jobs: - 'functest-{repo}-{container}-{tag}-pull' -- project: - name: 'functest-opnfv-functest-features-pull' - <<: *functest-params - container: 'functest-features' - jobs: - - 'functest-{repo}-{container}-{tag}-pull' - - job-template: name: 'functest-{repo}-{container}-{tag}-rmi' parameters: @@ -228,13 +221,6 @@ jobs: - 'functest-{repo}-{container}-{tag}-rmi' -- project: - name: 'functest-opnfv-functest-features-rmi' - <<: *functest-params - container: 'functest-features' - jobs: - - 'functest-{repo}-{container}-{tag}-rmi' - - job-template: name: 'functest-{repo}-{container}-{tag}-{test}-run' parameters: @@ -329,19 +315,6 @@ jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' -- project: - name: 'functest-opnfv-functest-features' - <<: *functest-params - container: 'functest-features' - test: - - doctor-notification - - functest-odl-sfc - - barometercollectd - - vgpu - - stor4nfv_os - jobs: - - 'functest-{repo}-{container}-{tag}-{test}-run' - - job-template: name: 'functest-{tag}-daily' project-type: multijob @@ -368,8 +341,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-rmi' - <<: *functest-jobs - multijob: name: pull containers projects: @@ -381,8 +352,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-pull' <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-pull' - <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} projects: @@ -468,19 +437,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *functest-jobs - - multijob: - name: opnfv/functest-features:{tag} - projects: - - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-vgpu-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run' - <<: *functest-jobs - job-template: name: 'functest-{repo}-{container}-{tag}-gate' @@ -592,16 +548,6 @@ - 'functest-{repo}-{container}-{tag}-gate' - 'functest-{repo}-{container}-{tag}-check' -- project: - name: functest-opnfv-functest-features-{tag}-build - <<: *functest-params - container: functest-features - ref_arg: BRANCH - path: docker/features - jobs: - - 'functest-{repo}-{container}-{tag}-gate' - - 'functest-{repo}-{container}-{tag}-check' - - job-template: name: 'functest-{tag}-check' project-type: multijob @@ -628,8 +574,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-rmi' - <<: *functest-jobs - multijob: name: remove dependencies projects: @@ -661,8 +605,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-check' <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-check' - <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} projects: @@ -748,19 +690,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *functest-jobs - - multijob: - name: opnfv/functest-features:{tag} - projects: - - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-vgpu-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run' - <<: *functest-jobs - trigger: name: functest-patchset-created @@ -812,8 +741,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-rmi' - <<: *functest-jobs - multijob: name: remove dependencies projects: @@ -845,8 +772,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-gate' <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-gate' - <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} projects: @@ -932,19 +857,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *functest-jobs - - multijob: - name: opnfv/functest-features:{tag} - projects: - - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-vgpu-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run' - <<: *functest-jobs - project: name: 'functest' |