Cleanup: Remove patches that landed upstream

[armband.git] / armband-fuel-config.mk

diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk
index 7aec79e..50db846 100644 (file)
--- a/armband-fuel-config.mk
+++ b/armband-fuel-config.mk
@@ -22,25 +22,20 @@ F_SUB_DIR   := ${F_REPOS_DIR}/sub
 ARMBAND_TRACK_REMOTES ?= yes
 
 # Armband plugins, supported archs & specific info
-export PLUGINS           := f_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild
+export PLUGINS           := f_yardstick-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild
 export UBUNTU_ARCH       := amd64 arm64
 export PRODNO            := OPNFV_A_FUEL
 export MIRROR_MOS_UBUNTU := linux.enea.com
-export EXTRA_RPM_REPOS   := armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/armband/x86_64,10
-
-# Temporary fuel-plugin-builder repo info for runtime patching
-export FPB_REPO      := https://github.com/openstack/fuel-plugins
-export FPB_BRANCH    := master
-export FPB_CHANGE    := refs/changes/31/311031/2
+export EXTRA_RPM_REPOS   := armband,http://linux.enea.com/mos-repos/centos/mos10.0-centos7/armband/x86_64,10
 
 # Armband git submodules for Fuel/OPNFV components
 export FUEL_PLUGIN_ODL_REPO        := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight
 export FUEL_PLUGIN_ODL_BRANCH      := opnfv-armband
 export FUEL_PLUGIN_ODL_CHANGE      := ${A_OPNFV_TAG}
-export OPNFV_QUAGGE_PACKAGING_REPO := https://github.com/alexandruavadanii/opnfv-quagga-packaging
 
 export OVS_NSH_DPDK_REPO   := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs
-export OVS_NSH_DPDK_BRANCH := ${A_OPNFV_TAG}
+export OVS_NSH_DPDK_BRANCH := opnfv-armband
+export OVS_NSH_DPDK_CHANGE := ${A_OPNFV_TAG}
 
 export VSPERF_REPO   := ${ARMBAND_BASE}/upstream/vswitchperf
 export VSPERF_BRANCH := opnfv-armband