diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/PR_revision.log | 3 | ||||
| -rwxr-xr-x | ci/build.sh | 3 | ||||
| -rwxr-xr-x | ci/clean.sh | 4 | ||||
| -rwxr-xr-x | ci/deploy.sh | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index f7b832e6..16cf08f8 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -42,3 +42,6 @@ 80,Change TenantNIC and PublicNIC to be role specific 81,Fix duplicate NeutronServicePlugins 82,Fixes neutron sdnvpn config resource +86,Moves sdnvpn config to env file +87,Pass vlan flag to fdio module when vlan is used for tenant network +88,Default tenant_nic to its physical name diff --git a/ci/build.sh b/ci/build.sh index f3ab497d..f1333ce4 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -132,9 +132,6 @@ if [[ "$MAKE_TARGETS" == "images" ]]; then if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-onos.spec* ]]; then MAKE_TARGETS+=" onos-rpm-check" fi - if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-opendaylight-sfc.spec* ]]; then - MAKE_TARGETS+=" opendaylight-sfc-rpm-check" - fi fi fi diff --git a/ci/clean.sh b/ci/clean.sh index c00a4df2..1e5e320e 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -30,8 +30,8 @@ for lib in common-functions parse-functions; do done vm_index=4 -ovs_bridges="br-admin br-tenant br-public br-storage" -ovs_bridges+=" br-private br-external" # Legecy names, remove in E river +ovs_bridges="br-admin br-tenant br-external br-storage" +ovs_bridges+=" br-private br-public" # Legacy names, remove in E river #OPNFV_NETWORK_TYPES=$(python3 -c 'from apex.common.constants import OPNFV_NETWORK_TYPES; print(" ".join(OPNFV_NETWORK_TYPES))') OPNFV_NETWORK_TYPES+=" admin tenant external storage api" diff --git a/ci/deploy.sh b/ci/deploy.sh index edc6062a..9affa80a 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -28,6 +28,9 @@ ntp_server="pool.ntp.org" post_config="TRUE" debug="FALSE" +ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm +ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm + declare -i CNT declare UNDERCLOUD declare -A deploy_options_array |