summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-03 02:58:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-03 02:58:55 +0000
commit3c3a55aaf68c93365fb0210944425300d972dbfd (patch)
treea69655d2a7b64388a8be7e6c6545f556ed19ce07
parent99e871e7795c06161039e4dffd2ebd35d2f44f53 (diff)
parentde49f824ea7cc9f1daa07d7434136cc4d42886ee (diff)
Merge "dovetail: adjust apex pod"
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml24
1 files changed, 10 insertions, 14 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 22bc28109..0bd32a4ab 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -81,27 +81,23 @@
SUT: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
-#apex CI PODs
- - apex-verify-master:
+#--------------------------------
+# Installers not using labels
+# CI PODs
+# This section should only contain the installers
+# that have not been switched using labels for slaves
+#--------------------------------
+#apex PODs
+ - lf-pod1:
slave-label: '{pod}'
SUT: apex
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - apex-daily-master:
+ - lf-pod1:
slave-label: '{pod}'
SUT: apex
auto-trigger-name: 'daily-trigger-disabled'
- <<: *master
-# - apex-verify-colorado:
-# slave-label: '{pod}'
-# SUT: apex
-# auto-trigger-name: 'daily-trigger-disabled'
-# <<: *danube
-# - apex-daily-colorado:
-# slave-label: '{pod}'
-# SUT: apex
-# auto-trigger-name: 'daily-trigger-disabled'
-# <<: *danube
+ <<: *danube
#armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal