Set version of Fuel to 6.1 everywhere

Change-Id: Ie6c7e21674d698650c25cffdc05d33f0337b3c2e

config.mk

@@ -38,7 +38,7 @@ CURRENT_VERSION:=$(PRODUCT_VERSION)
 # If it is set then diff $(BASE_VERSION)->$(CURRENT_VERSION)
 BASE_VERSION:=6.0
 
-PACKAGE_VERSION=6.0.0
+PACKAGE_VERSION=6.1.0
 # UPGRADE_VERSIONS?=\
 #	6.0:5.1 \
 #	5.1 \
@@ -64,9 +64,7 @@ PACKAGE_VERSION=6.0.0
 # available as an artifact from a previous build job.
 #
 UPGRADE_VERSIONS?=\
-	$(CURRENT_VERSION):$(BASE_VERSION) \
-	5.1.1:5.1 \
-	5.0.2
+	$(CURRENT_VERSION)
 
 # Path to pre-built artifacts
 DEPS_DIR_CURRENT?=$(DEPS_DIR)/$(CURRENT_VERSION)

fuelweb_test/settings.py

@@ -309,12 +309,12 @@ FUEL_SETTINGS_YAML = os.environ.get('FUEL_SETTINGS_YAML',
 
 TARBALL_PATH = os.environ.get('TARBALL_PATH')
 
-UPGRADE_FUEL_FROM = os.environ.get('UPGRADE_FUEL_FROM', '5.0')
-UPGRADE_FUEL_TO = os.environ.get('UPGRADE_FUEL_TO', '6.0')
+UPGRADE_FUEL_FROM = os.environ.get('UPGRADE_FUEL_FROM', '6.0.1')
+UPGRADE_FUEL_TO = os.environ.get('UPGRADE_FUEL_TO', '6.1')
 
 SNAPSHOT = os.environ.get('SNAPSHOT', '')
 # For 5.1.1 we have 2 releases in tarball and should specify what we need
-RELEASE_VERSION = os.environ.get('RELEASE_VERSION', "2014.1.3-5.1.1")
+RELEASE_VERSION = os.environ.get('RELEASE_VERSION', "2014.2.2-6.1")
 
 # URL to custom mirror with new OSCI packages wich should be tested,
 # for example:

packages/rpm/specs/fuel-docker-images.spec

@@ -1,7 +1,11 @@
-Name:      fuel-docker-images
-Summary:   Fuel Docker images
-Version:   1.0
-Release:   1
+%define name fuel-docker-images
+%define version 6.1.0
+%define release 1
+
+Name:    %{name}
+Summary:  Fuel Docker images
+Version: %{version}
+Release: %{release}
 License:   Apache 2.0
 BuildRoot: %{_tmppath}/%{name}-%{version}
 Source0:   fuel-images.tar.lrz

specs/fuel-main.spec

@@ -2,7 +2,7 @@
 %define repo_name fuel-main
 
 %define name fuel-image
-%define version 6.0.0
+%define version 6.1.0
 %define release 1
 
 Summary: Fuel-image package