diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-05-26 09:40:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-26 09:40:08 +0000 |
| commit | a7d4197cef093a5eae141efa34c0833c76a1f183 (patch) | |
| tree | eb7397d3a9d42c43755aacb41bee75047b9d6c0e /jjb/functest | |
| parent | 17b9fb9214e4796a20b1dfbda15b0013d4f97312 (diff) | |
| parent | 5922d6b54ad1231b1bb5446a72f33a21220d1cbb (diff) | |
Merge "compass: Switch using labels instead of slaves"
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 24673612b..d7e37292a 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -69,6 +69,23 @@ slave-label: joid-virtual installer: joid <<: *brahmaputra +# compass CI PODs + - baremetal: + slave-label: compass-baremetal + installer: compass + <<: *master + - virtual: + slave-label: compass-virtual + installer: compass + <<: *master + - baremetal: + slave-label: compass-baremetal + installer: compass + <<: *brahmaputra + - virtual: + slave-label: compass-virtual + installer: compass + <<: *brahmaputra #-------------------------------- # Installers not using labels # CI PODs @@ -83,14 +100,6 @@ slave-label: '{pod}' installer: apex <<: *brahmaputra - - intel-pod8: - slave-label: '{pod}' - installer: compass - <<: *master - - huawei-pod1: - slave-label: '{pod}' - installer: compass - <<: *brahmaputra #-------------------------------- # None-CI PODs #-------------------------------- @@ -106,18 +115,10 @@ slave-label: '{pod}' installer: joid <<: *master - - huawei-virtual: - slave-label: '{pod}' - installer: compass - <<: *master - huawei-pod2: slave-label: '{pod}' installer: compass <<: *master - - huawei-pod1: - slave-label: '{pod}' - installer: compass - <<: *master - nokia-pod1: slave-label: '{pod}' installer: apex @@ -134,10 +135,6 @@ slave-label: '{pod}' installer: fuel <<: *brahmaputra - - huawei-virtual: - slave-label: '{pod}' - installer: compass - <<: *brahmaputra #-------------------------------- testsuite: @@ -263,7 +260,6 @@ - 'set-functest-env' - 'functest-suite' - - builder: name: functest-suite builders: |