diff options
| -rw-r--r-- | jjb/functest/functest-kubernetes-pi.yaml | 23 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 23 |
2 files changed, 44 insertions, 2 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml index c22320277..4df9eef6c 100644 --- a/jjb/functest/functest-kubernetes-pi.yaml +++ b/jjb/functest/functest-kubernetes-pi.yaml @@ -261,6 +261,27 @@ - functest-kubernetes-pi-run-containers: <<: *functest-kubernetes-pi-run-containers +- job-template: + name: 'functest-kubernetes-pi-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run' + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'GLOBAL' + blocking-jobs: + - '^functest-kubernetes(-pi)?-*-k8s_vims-run$' + parameters: + - functest-kubernetes-pi-slave: + slave: '{slave}' + - functest-kubernetes-pi-build_tag: + build_tag: '' + - functest-kubernetes-pi-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-pi-DEBUG: + DEBUG: 'true' + builders: + - functest-kubernetes-pi-run-containers: + <<: *functest-kubernetes-pi-run-containers + - project: name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck' <<: *functest-kubernetes-pi-params @@ -311,7 +332,7 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-pi-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run' - builder: diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 7093ba1e5..db5c50037 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -270,6 +270,27 @@ - functest-kubernetes-run-containers: <<: *functest-kubernetes-run-containers +- job-template: + name: 'functest-kubernetes-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run' + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'GLOBAL' + blocking-jobs: + - '^functest-kubernetes(-pi)?-*-k8s_vims-run$' + parameters: + - functest-kubernetes-slave: + slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-DEBUG: + DEBUG: 'true' + builders: + - functest-kubernetes-run-containers: + <<: *functest-kubernetes-run-containers + - project: name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck' <<: *functest-kubernetes-params @@ -314,7 +335,7 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run' - builder: |