diff options
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 28 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 74a134eda..7b25a9b2b 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -95,7 +95,7 @@ - 'os-odl-sfc-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-dpdk-ha': + - 'os-nosdn-ovs_dpdk-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - 'k8-nosdn-nofeature-ha': @@ -116,7 +116,7 @@ - 'os-odl-sfc-noha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-dpdk-noha': + - 'os-nosdn-ovs_dpdk-noha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' @@ -424,7 +424,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-centos-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-centos-master-trigger' triggers: - timed: '' - trigger: @@ -460,7 +460,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-centos-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger' triggers: - timed: '' @@ -504,7 +504,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-ha-huawei-pod7-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-huawei-pod7-danube-trigger' triggers: - timed: '' - trigger: @@ -540,7 +540,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-huawei-pod7-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger' triggers: - timed: '' #-------------------- @@ -583,7 +583,7 @@ triggers: - timed: '0 14 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger' triggers: - timed: '0 16 * * *' - trigger: @@ -619,7 +619,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger' triggers: - timed: '' @@ -663,7 +663,7 @@ triggers: - timed: '0 13 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger' triggers: - timed: '0 9 * * *' - trigger: @@ -699,7 +699,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger' triggers: - timed: '' @@ -743,7 +743,7 @@ triggers: - timed: '0 13 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-virtual-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger' triggers: - timed: '0 17 * * *' - trigger: @@ -779,7 +779,7 @@ triggers: - timed: '0 20 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-noha-virtual-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger' triggers: - timed: '0 11 * * *' @@ -823,7 +823,7 @@ triggers: - timed: '0 16 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger' triggers: - timed: '0 14 * * *' - trigger: @@ -859,6 +859,6 @@ triggers: - timed: '0 19 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger' triggers: - timed: '0 12 * * *' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 9d4ae5175..ad069a57c 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -39,7 +39,7 @@ elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then export NETWORK_CONF_FILE=network_onos.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then export NETWORK_CONF_FILE=network_openo.yml -elif [[ "${DEPLOY_SCENARIO}" =~ "-dpdk" ]]; then +elif [[ "${DEPLOY_SCENARIO}" =~ "-ovs_dpdk" ]]; then export NETWORK_CONF_FILE=network_dpdk.yml else export NETWORK_CONF_FILE=network.yml |