diff options
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 40 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 5 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-lab-reconfig.sh | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-project-jobs.yml | 2 |
4 files changed, 22 insertions, 27 deletions
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 |