From fb22e2cad8c8acdbde70552310dd72951f6b52a8 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Sat, 21 May 2016 22:57:16 +0200 Subject: Rename LF Jenkins slaves and update impacted jobs Change-Id: If58c84e6f431db88eed3376e446479826da71502 Signed-off-by: Fatih Degirmenci --- jjb/apex/apex.yml | 4 ++-- jjb/bottlenecks/bottlenecks-ci-jobs.yml | 6 ++--- jjb/fuel/fuel-ci-jobs.yml | 40 ++++++++++++++++----------------- jjb/fuel/fuel-deploy.sh | 5 ----- jjb/fuel/fuel-lab-reconfig.sh | 2 +- jjb/fuel/fuel-project-jobs.yml | 2 +- jjb/functest/functest-ci-jobs.yml | 6 ++--- jjb/opnfv/slave-params.yml | 12 +++++----- jjb/yardstick/yardstick-ci-jobs.yml | 20 ++++++++--------- 9 files changed, 46 insertions(+), 51 deletions(-) diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index f9c6b838e..1fe02d815 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -24,7 +24,7 @@ branch: 'stable/brahmaputra' gs-pathname: '/brahmaputra' block-stream: 'master' - slave: 'opnfv-jump-1' + slave: 'lf-pod1' verify-slave: 'apex-verify-brahmaputra' daily-slave: 'apex-daily-brahmaputra' disabled: true @@ -43,7 +43,7 @@ branch: 'stable/brahmaputra' gs-pathname: '/brahmaputra' block-stream: 'master' - slave: 'opnfv-jump-1' + slave: 'lf-pod1' verify-slave: 'apex-verify-brahmaputra' daily-slave: 'apex-daily-brahmaputra' disabled: true diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index 5a155727c..c3edce151 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -30,7 +30,7 @@ # brahmaputra #-------------------------------- pod: - - opnfv-jump-2: + - lf-pod2: installer: fuel disabled: true <<: *brahmaputra @@ -45,7 +45,7 @@ #-------------------------------- # master #-------------------------------- - - opnfv-jump-2: + - lf-pod2: installer: fuel <<: *master - ericsson-pod1: @@ -243,7 +243,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'bottlenecks-params-opnfv-jump-2' + name: 'bottlenecks-params-lf-pod2' parameters: - string: name: BOTTLENECKS_DB_TARGET diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index acfcedabf..f6c21e72e 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -24,7 +24,7 @@ # brahmaputra #-------------------------------- pod: - - opnfv-jump-2: + - lf-pod2: <<: *brahmaputra - ericsson-pod1: <<: *brahmaputra @@ -35,7 +35,7 @@ #-------------------------------- # master #-------------------------------- - - opnfv-jump-2: + - lf-pod2: <<: *master - ericsson-pod1: <<: *master @@ -239,39 +239,39 @@ # LF POD2 Triggers running against master branch #----------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-master-trigger' triggers: - timed: '0 0 * * *' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-master-trigger' triggers: - timed: '0 3 * * *' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-master-trigger' triggers: - timed: '0 6 * * *' - trigger: - name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-onos-nofeature-ha-lf-pod2-master-trigger' triggers: - timed: '0 9 * * *' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-master-trigger' triggers: - timed: '0 12 * * *' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-master-trigger' triggers: - timed: '0 15 * * *' - trigger: - name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-nosdn-kvm-ha-lf-pod2-master-trigger' triggers: - timed: '0 18 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger' + name: 'fuel-os-nosdn-ovs-ha-lf-pod2-master-trigger' triggers: - timed: '0 21 * * *' - trigger: - name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger' + name: 'fuel-os-nosdn-kvm-noha-lf-pod2-master-trigger' triggers: - timed: '' #----------------------------------------------- @@ -365,7 +365,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -391,7 +391,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-nosdn-kvm-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -417,7 +417,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -443,7 +443,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -469,7 +469,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-onos-nofeature-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -496,7 +496,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-nosdn-ovs-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -522,7 +522,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -548,7 +548,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -574,7 +574,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-brahmaputra-trigger' + name: 'fuel-os-nosdn-kvm-noha-lf-pod2-brahmaputra-trigger' triggers: - timed: '' - trigger: diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index ceccc54b6..14d48e789 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -34,11 +34,6 @@ BRIDGE=pxebr LAB_NAME=${NODE_NAME/-*} POD_NAME=${NODE_NAME/*-} -if [[ "$NODE_NAME" == "opnfv-jump-2" ]]; then - LAB_NAME="lf" - POD_NAME="pod2" -fi - if [[ "$NODE_NAME" =~ "virtual" ]]; then POD_NAME="virtual_kvm" fi diff --git a/jjb/fuel/fuel-lab-reconfig.sh b/jjb/fuel/fuel-lab-reconfig.sh index 59f660066..4b42a396e 100755 --- a/jjb/fuel/fuel-lab-reconfig.sh +++ b/jjb/fuel/fuel-lab-reconfig.sh @@ -68,7 +68,7 @@ if [ "$ping_flag" -eq 1 ]; then echo "Slave is pingable, now wait 180 seconds for services to start" sleep 180 else - echo "Slave did not come back up after reboot: please check opnfv-jump-2" + echo "Slave did not come back up after reboot: please check lf-pod2" exit 1 fi diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index f377c9bed..eee588d24 100755 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -318,7 +318,7 @@ description: 'Slave name on Jenkins' allowed-slaves: - ericsson-pod2 - - opnfv-jump-2 + - lf-pod2 - ericsson-pod1 default-slaves: - ericsson-pod2 diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index c955d4e58..ce7be1fa9 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -25,7 +25,7 @@ # brahmaputra #-------------------------------- pod: - - opnfv-jump-1: + - lf-pod1: installer: apex <<: *brahmaputra - intel-pod5: @@ -43,7 +43,7 @@ - ericsson-pod2: installer: fuel <<: *brahmaputra - - opnfv-jump-2: + - lf-pod2: installer: fuel <<: *brahmaputra - virtual: @@ -61,7 +61,7 @@ #-------------------------------- # master #-------------------------------- - - opnfv-jump-2: + - lf-pod2: installer: fuel <<: *master - intel-pod6: diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index f0cf556b7..7216f7cbc 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -1,13 +1,13 @@ - parameter: - name: 'opnfv-jump-1-defaults' + name: 'lf-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - opnfv-jump-1 + - lf-pod1 default-slaves: - - opnfv-jump-1 + - lf-pod1 - string: name: INSTALLER_VERSION default: latest @@ -22,15 +22,15 @@ description: 'SSH key to use for Apex' - parameter: - name: 'opnfv-jump-2-defaults' + name: 'lf-pod2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - opnfv-jump-2 + - lf-pod2 default-slaves: - - opnfv-jump-2 + - lf-pod2 - string: name: INSTALLER_VERSION default: stable diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 7496ba7ec..a907d3492 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -25,12 +25,12 @@ # brahmaputra #-------------------------------- pod: - - opnfv-jump-1: + - lf-pod1: installer: apex suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - - opnfv-jump-2: + - lf-pod2: installer: fuel suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' @@ -78,7 +78,12 @@ #-------------------------------- # master #-------------------------------- - - opnfv-jump-2: + - lf-pod1: + installer: apex + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master + - lf-pod2: installer: fuel suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' @@ -118,11 +123,6 @@ suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - - opnfv-jump-1: - installer: apex - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - huawei-pod2: installer: compass suite: daily @@ -355,7 +355,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-opnfv-jump-1' + name: 'yardstick-params-lf-pod1' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -363,7 +363,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-opnfv-jump-2' + name: 'yardstick-params-lf-pod2' parameters: - string: name: YARDSTICK_DB_BACKEND -- cgit 1.2.3-korg