diff options
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 16 | ||||
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 18 |
3 files changed, 12 insertions, 24 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 59ba01588..149447733 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -50,8 +50,6 @@ fi case $NODE_NAME in orange-fr-pod2) POD=orange-pod2 ;; - juniper-us-test-1) - POD=juniper-pod1 ;; *virtual*) POD=default ;; *) diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 2ca4459dd..5892e7c96 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -415,9 +415,9 @@ name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - juniper-us-test-1 + - juniper-pod1 default-slaves: - - juniper-us-test-1 + - juniper-pod1 - string: name: INSTALLER_VERSION default: latest @@ -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 8dd0a4af0..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,17 +166,12 @@ ################# - 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 * * *' #- trigger: -# name: 'qtip-daily-juniper-build1-trigger' +# name: 'qtip-daily-juniper-pod1-trigger' # triggers: # - timed : '0 0 * * *' |