X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=armband-fuel-config.mk;h=3b2bd7b882106c6c55f781be1a1892358c643eb0;hb=01e02374e99162c86e8f18aaaba5f8071aad21dd;hp=ef5e42c60893a6cc3860e83d5b98b5a5e6a64fbf;hpb=ec0504dbebc5e3f9e29606f1995a0ad0b603bdad;p=armband.git

diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk
index ef5e42c6..3b2bd7b8 100644
--- a/armband-fuel-config.mk
+++ b/armband-fuel-config.mk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2016 Enea AB and others.
+# Copyright (c) 2016,2017 Enea AB and others.
 # Alexandru.Avadanii@enea.com
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -12,37 +12,12 @@ A_FUEL_BASE := ${ARMBAND_BASE}/upstream/fuel
 A_PATCH_DIR := ${ARMBAND_BASE}/patches
 A_OPNFV_TAG  = armband-opnfv
 A_PATCHES    = $(shell find ${A_PATCH_DIR} -name '*.patch')
-F_BUILD_DIR := ${A_FUEL_BASE}/build
-F_REPOS_DIR := ${F_BUILD_DIR}/f_repos
-F_PATCH_DIR := ${F_REPOS_DIR}/patch
-F_SUB_DIR   := ${F_REPOS_DIR}/sub
+F_PATCH_DIR := ${A_FUEL_BASE}/mcp/patches
 
 # To enable remote tracking, set the following var to any non-empty string.
 # Leaving this var empty will bind each git submodule to its saved commit.
-ARMBAND_TRACK_REMOTES ?= yes
-
-# Armband plugins, supported archs & specific info
-# FIXME(alav): re-enable for D release after rebasing to Newton
-#export PLUGINS           := f_tacker-pluginbuild
-export PLUGINS           := f_yardstick-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-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/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 OVS_NSH_DPDK_REPO   := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs
-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
-export VSPERF_CHANGE := ${A_OPNFV_TAG}
+ARMBAND_TRACK_REMOTES ?=
 
 # for the patches applying purposes (empty git config in docker build container)
-export GIT_COMMITTER_NAME?=Fuel OPNFV
-export GIT_COMMITTER_EMAIL?=fuel@opnfv.org
+export GIT_COMMITTER_NAME?=OPNFV Armband
+export GIT_COMMITTER_EMAIL?=armband@enea.com