diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2020-08-22 22:09:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-08-22 22:09:11 +0000 |
| commit | a0ce773fa8693c53ffb303c9241fd5f2c2592f1e (patch) | |
| tree | 389dbba9d0cc9109d2fe170de9d566fab2fe9126 | |
| parent | 979e8ac6ac7acf78730a2eee199e0e8f78a316e1 (diff) | |
| parent | 3cd4b0e938d096bbc1155ffb879b6327cb625156 (diff) | |
Merge "Revert "Run one single ims at glance""
| -rw-r--r-- | jjb/functest/functest-kubernetes-pi.yaml | 23 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 23 |
2 files changed, 2 insertions, 44 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml index 627d55f77..a8d3c89f8 100644 --- a/jjb/functest/functest-kubernetes-pi.yaml +++ b/jjb/functest/functest-kubernetes-pi.yaml @@ -275,27 +275,6 @@ - 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 @@ -357,7 +336,7 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-pi-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run' + - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run' - builder: diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 8295627b8..1d17c0d47 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -284,27 +284,6 @@ - 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 @@ -360,7 +339,7 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run' + - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' - builder: |