From 3acfee45fb0b053bb7fea78ac83cecd02ff14bd2 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Thu, 16 Jun 2016 19:56:10 +0000
Subject: Revert "Apex,Functest: Add healthcheck for Apex verify jobs"
This reverts commit ca27977f61fe104a5252cdc40b42c6c774724530.
Change-Id: I7eedfab682fc9f46c128c4164983ad9ae625b384
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
jjb/apex/apex.yml | 21 +++++++--------------
jjb/functest/functest-ci-jobs.yml | 1 -
2 files changed, 7 insertions(+), 15 deletions(-)
(limited to 'jjb')
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'
--
cgit