diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-05-05 22:20:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-05 22:20:36 +0000 |
| commit | 883bfcb0cfce602e691e56165c6d2eba974a859e (patch) | |
| tree | 577ade502424db8c38de25fe02f709161b2d7d44 | |
| parent | dc34383d611547e1488c4162b0f58a18026664a6 (diff) | |
| parent | 0480843bcbd89f1c274bffa2b38f78ca842c08b6 (diff) | |
Merge "Rename Dell Jenkins Slaves"
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 12 | ||||
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 16 |
2 files changed, 9 insertions, 19 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 930f599ec..5892e7c96 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -523,15 +523,15 @@ description: 'SSH key to use for Apex' - parameter: - name: 'dell-us-testing-bm-1-defaults' + name: 'dell-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - dell-us-testing-bm-1 + - dell-pod1 default-slaves: - - dell-us-testing-bm-1 + - dell-pod1 - string: name: INSTALLER_VERSION default: latest @@ -542,15 +542,15 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'dell-us-deploying-bm3-defaults' + name: 'dell-pod2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - dell-us-deploying-bm3 + - dell-pod2 default-slaves: - - dell-us-deploying-bm3 + - dell-pod2 - string: name: INSTALLER_VERSION default: latest diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index d77e50e30..44bdd7138 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -23,19 +23,14 @@ # brahmaputra #-------------------------------- pod: - - dell-us-testing-bm-1: + - dell-pod1: installer: compass - auto-trigger-name: 'qtip-daily-dell-us-testing-bm-1-trigger' + auto-trigger-name: 'qtip-daily-dell-pod1-trigger' <<: *brahmaputra - orange-pod2: installer: joid auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - - dell-us-deploying-bm3: - installer: fuel - auto-trigger-name: 'qtip-daily-dell-us-deploying-bm3-trigger' - <<: *brahmaputra - #-------------------------------- # master #-------------------------------- @@ -171,12 +166,7 @@ ################# - trigger: - name: 'qtip-daily-dell-us-deploying-bm3-trigger' - triggers: - - timed: '0 0 * * *' - -- trigger: - name: 'qtip-daily-dell-us-testing-bm-1-trigger' + name: 'qtip-daily-dell-pod1-trigger' triggers: - timed: '0 3 * * *' |