From 5922d6b54ad1231b1bb5446a72f33a21220d1cbb Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 26 May 2016 00:01:52 +0200 Subject: compass: Switch using labels instead of slaves This change switches compass jobs to use labels instead of tying jobs to slaves. The changes in detail are: - Compass jobs can roam on any pod that is labelled with compass-baremetal and compass-virtual. - Above means that there is no branch/pod allocation anymore. - New jobs are created in order to get rid of pod names from them and just use baremetal or virtual in names. - Old jobs are removed. - Related test jobs are updated. - huawei-virtual label is renamed to compass-virtual since we still have installer specific slaves, not company specific. In future the job might end up on a none-Huawei slave too. - huawei-pod2 is not a CI POD so it is left in none-CI PODs section. - block relations and triggers might require fine tuning and left to compass project to decide how to adjust Job structure remains same; one parent job calling 3 downstream jobs: deploy, functest, yardstick. The OS to deploy (trusty or centos7) needs to be solved in a separate patch in a sustainable way. Change-Id: I22bfaff36640667b6764f0e303a3286af0eb41b2 Signed-off-by: Fatih Degirmenci --- jjb/yardstick/yardstick-ci-jobs.yml | 84 +++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 45 deletions(-) (limited to 'jjb/yardstick') diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 3d59e61ce..48c335a03 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -32,51 +32,73 @@ - baremetal: slave-label: fuel-baremetal installer: fuel - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - virtual: slave-label: fuel-virtual installer: fuel - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - baremetal: slave-label: fuel-baremetal installer: fuel - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - virtual: slave-label: fuel-virtual installer: fuel - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra # just in case if things go wrong - lf-pod2: slave-label: '{pod}' installer: fuel - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master # joid CI PODs - baremetal: slave-label: joid-baremetal installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - virtual: slave-label: joid-virtual installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - baremetal: slave-label: joid-baremetal installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - virtual: slave-label: joid-virtual installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' + <<: *brahmaputra + +# compass CI PODs + - baremetal: + slave-label: compass-baremetal + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - virtual: + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: compass-baremetal + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *brahmaputra + - virtual: + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra #-------------------------------- # Installers not using labels @@ -87,22 +109,12 @@ - lf-pod1: slave-label: '{pod}' installer: apex - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - lf-pod1: slave-label: '{pod}' installer: apex - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *brahmaputra - - intel-pod8: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - - huawei-pod1: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra #-------------------------------- # None-CI PODs @@ -110,35 +122,22 @@ - orange-pod2: slave-label: '{pod}' installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - zte-pod1: slave-label: '{pod}' installer: fuel - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - orange-pod2: slave-label: '{pod}' installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - - huawei-pod1: - slave-label: '{pod}' - installer: compass - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - huawei-pod2: slave-label: '{pod}' installer: compass - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - - huawei-virtual: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - huawei-pod3: slave-label: '{pod}' @@ -150,11 +149,6 @@ installer: compass auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' <<: *master - - huawei-virtual: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *brahmaputra #-------------------------------- testsuite: - 'daily' @@ -305,7 +299,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-huawei-pod1' + name: 'yardstick-params-compass-baremetal' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -345,7 +339,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-huawei-virtual' + name: 'yardstick-params-compass-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND -- cgit 1.2.3-korg