X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=armband-fuel-config.mk;h=a4a0ad5ed63f1b99966f4e1741f7e411bac4187d;hb=74238bffbde967b83a6c9db762caf8a18430dcd2;hp=1cd52bdd38869b54fb92872db1083810fff37f14;hpb=2bde158711c7a93bbe7c03a8967780d31f491f7d;p=armband.git

diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk
index 1cd52bdd..a4a0ad5e 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,42 +12,13 @@ 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
+A_BRANCH     = $(shell sed -ne 's/defaultbranch=//p' ${ARMBAND_BASE}/.gitreview)
+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_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild
-export PLUGINS           := f_yardstick-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-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
-
-# 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
-
-# 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