diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 13 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 20 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 4 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 53 |
4 files changed, 59 insertions, 31 deletions
diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 561296000..25ca03ab3 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -31,18 +31,13 @@ - 'tempest' - 'healthcheck' - 'features' - - 'components' - 'smoke' - 'benchmarking' - 'vnf' exclude: - stream: 'master' - image: 'components' - - stream: 'iruya' - image: 'components' - - stream: 'hunter' - image: 'components' + image: 'tempest' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -145,10 +140,6 @@ <<: *build-job-settings - name: 'functest-features-docker-build-arm64-{stream}' <<: *build-job-settings - - name: 'functest-components-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-components-docker-build-arm64-{stream}' - <<: *build-job-settings - name: 'functest-smoke-docker-build-amd64-{stream}' <<: *build-job-settings - name: 'functest-smoke-docker-build-arm64-{stream}' @@ -170,8 +161,6 @@ <<: *manifest-job-settings - name: 'functest-features-docker-manifest-{stream}' <<: *manifest-job-settings - - name: 'functest-components-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-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 9f8f22d5e..51638ff39 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -90,8 +90,7 @@ name: functest-kubernetes-run-containers builders: - shell: | - set +e - set -x + set +ex [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -107,7 +106,7 @@ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ - gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID + gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 find $WORKSPACE -type f \ -printf \ "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n" @@ -220,8 +219,14 @@ container: 'functest-kubernetes-smoke' test: - k8s_conformance + - xrally_kubernetes jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + exclude: + - tag: iruya + test: xrally_kubernetes + - tag: hunter + test: xrally_kubernetes - project: name: 'functest-kubernetes-opnfv-functest-kubernetes-features' @@ -273,7 +278,10 @@ <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-smoke:{tag} + execution-type: SEQUENTIALLY projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - multijob: @@ -430,7 +438,10 @@ <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-smoke:{tag} + execution-type: SEQUENTIALLY projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - multijob: @@ -523,7 +534,10 @@ <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-smoke:{tag} + execution-type: SEQUENTIALLY projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - multijob: diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 8fe365958..80fac1ccc 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -112,8 +112,6 @@ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ -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/ \ @@ -536,6 +534,8 @@ jobs: - 'functest-{repo}-{container}-{tag}-gate' - 'functest-{repo}-{container}-{tag}-check' + exclude: + - tag: latest - project: name: functest-opnfv-functest-healthcheck-{tag}-build diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 48c0952cc..c22056145 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -10,17 +10,20 @@ tag: - latest: branch: master + slave: lf-build2 - iruya: branch: stable/iruya + slave: lf-build2 - hunter: branch: stable/hunter + slave: lf-build2 - parameter: name: xtesting-slave parameters: - label: name: slave - default: lf-build2 + default: '{slave}' - parameter: name: xtesting-branch @@ -134,7 +137,8 @@ - job-template: name: 'xtesting-{repo}-{container}-{tag}-pull' parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' builders: - xtesting-pull-containers: <<: *xtesting-containers @@ -149,7 +153,8 @@ - job-template: name: 'xtesting-{repo}-{container}-{tag}-rmi' parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' builders: - xtesting-remove-images: <<: *xtesting-containers @@ -164,7 +169,8 @@ - job-template: name: 'xtesting-{repo}-{container}-{tag}-{test}-run' parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' builders: - xtesting-run-containers: <<: *xtesting-run-containers @@ -179,6 +185,12 @@ - third - fourth - fifth + - sixth + exclude: + - tag: hunter + test: sixth + - tag: iruya + test: sixth jobs: - 'xtesting-{repo}-{container}-{tag}-{test}-run' @@ -188,13 +200,14 @@ triggers: - timed: '@daily' parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^xtesting-[a-z]+-(daily|check|gate)$' + - '^xtesting-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -219,11 +232,14 @@ <<: *xtesting-jobs - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run' <<: *xtesting-jobs + - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run' + <<: *xtesting-jobs - job-template: name: 'xtesting-{repo}-{container}-{tag}-gate' parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' scm: - xtesting-scm: ref: $GERRIT_REFSPEC @@ -235,7 +251,8 @@ - job-template: name: 'xtesting-{repo}-{container}-{tag}-check' parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' - xtesting-branch: branch: '{branch}' scm: @@ -252,6 +269,7 @@ port: container: alpine tag: 3.9 + slave: master jobs: - 'xtesting-{repo}-{container}-{tag}-rmi' @@ -261,6 +279,7 @@ port: container: alpine tag: 3.9 + slave: master jobs: - 'xtesting-{repo}-{container}-{tag}-pull' @@ -278,7 +297,8 @@ name: 'xtesting-{tag}-check' project-type: multijob parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' - xtesting-branch: branch: '{branch}' properties: @@ -286,7 +306,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^xtesting-[a-z]+-(daily|check|gate)$' + - '^xtesting-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -304,7 +324,7 @@ - name: 'xtesting-_-alpine-3.9-pull' <<: *xtesting-jobs - multijob: - name: opnfv/functest-xtesting + name: opnfv/xtesting projects: - name: 'xtesting-opnfv-xtesting-{tag}-check' <<: *xtesting-jobs @@ -321,6 +341,8 @@ <<: *xtesting-jobs - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run' <<: *xtesting-jobs + - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run' + <<: *xtesting-jobs - trigger: name: xtesting-patchset-created @@ -352,13 +374,14 @@ - xtesting-patchset-created: branch: '{branch}' parameters: - - xtesting-slave + - xtesting-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^xtesting-[a-z]+-(daily|check|gate)$' + - '^xtesting-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -376,7 +399,7 @@ - name: 'xtesting-_-alpine-3.9-pull' <<: *xtesting-jobs - multijob: - name: opnfv/functest-xtesting + name: opnfv/xtesting projects: - name: 'xtesting-opnfv-xtesting-{tag}-gate' <<: *xtesting-jobs @@ -393,6 +416,8 @@ <<: *xtesting-jobs - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run' <<: *xtesting-jobs + - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run' + <<: *xtesting-jobs - project: name: 'xtesting' |