diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-16 19:57:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-16 19:57:08 +0000 |
| commit | ae55883f35d95a003c558a9aded80e6231c82364 (patch) | |
| tree | c050aa5974b6ed4cb469a80aa98861aa6a396493 | |
| parent | 070abdd19b0db8514ba5471a0c3b29d1fe457b37 (diff) | |
| parent | 3acfee45fb0b053bb7fea78ac83cecd02ff14bd2 (diff) | |
Merge "Revert "Apex,Functest: Add healthcheck for Apex verify jobs""
| -rw-r--r-- | jjb/apex/apex.yml | 21 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 1 |
2 files changed, 7 insertions, 15 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index c90d63192..6c14a8107 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -238,13 +238,13 @@ git-revision: false block: true same-node: true - - trigger-builds: - - project: 'functest-apex-{verify-slave}-suite-{stream1}' - predefined-parameters: | - DEPLOY_SCENARIO=os-nosdn-nofeature-ha - FUNCTEST_SUITE_NAME=healthcheck - block: true - same-node: true +# - trigger-builds: +# - project: 'functest-apex-{verify-slave}-suite-{stream1}' +# predefined-parameters: | +# DEPLOY_SCENARIO=os-nosdn-nofeature-ha +# FUNCTEST_SUITE_NAME=vping_userdata +# block: true +# same-node: true - trigger-builds: - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}' predefined-parameters: | @@ -253,13 +253,6 @@ git-revision: false block: true same-node: true - - trigger-builds: - - project: 'functest-apex-{verify-slave}-suite-{stream1}' - predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l2-nofeature-ha - FUNCTEST_SUITE_NAME=healthcheck - block: true - same-node: true - 'apex-workspace-cleanup' - job-template: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 27e1ee333..8bbed4f15 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -200,7 +200,6 @@ - choice: name: FUNCTEST_SUITE_NAME choices: - - 'healthcheck' - 'tempest' - 'rally' - 'odl' |