diff options
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/config.mk | 14 | ||||
| -rw-r--r-- | build/fuel-main_repo_versions.patch | 41 |
3 files changed, 14 insertions, 43 deletions
diff --git a/build/Makefile b/build/Makefile index de3031269..bc6a9418c 100644 --- a/build/Makefile +++ b/build/Makefile @@ -105,8 +105,6 @@ $(ISOCACHE): fi cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG) @echo "fuel" `git -C /tmp/fuel-main show | grep commit | head -1 | cut -d " " -f2` >> $(VERSION_FILE) - # Lock down the exact Fuel repo versions - cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_repo_versions.patch # Patch for adding dosfstools, as Fuel 6.1 is running mkfs.vfat cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_5.patch # Patch for using the Czech Fuel mirror diff --git a/build/config.mk b/build/config.mk index aa2f5a658..dcffe40f1 100644 --- a/build/config.mk +++ b/build/config.mk @@ -13,6 +13,20 @@ FUEL_MAIN_TAG = a365f05b903368225da3fea9aa42afc1d50dc9b4 MOS_VERSION = 8.0 OPENSTACK_VERSION = liberty-8.0 +# Pinning down exact Fuel repo versions +export FUELLIB_COMMIT=f2ed8e4503dd9641b70b94381d30e21689b8e5c9 +export NAILGUN_COMMIT=baec8643ca624e52b37873f2dbd511c135d236d9 +export PYTHON_FUELCLIENT_COMMIT=4f234669cfe88a9406f4e438b1e1f74f1ef484a5 +export FUEL_AGENT_COMMIT=658be72c4b42d3e1436b86ac4567ab914bfb451b +export FUEL_NAILGUN_AGENT_COMMIT=b2bb466fd5bd92da614cdbd819d6999c510ebfb1 +export ASTUTE_COMMIT=b81577a5b7857c4be8748492bae1dec2fa89b446 +export OSTF_COMMIT=3bc76a63a9e7d195ff34eadc29552f4235fa6c52 +export FUEL_MIRROR_COMMIT=fb45b80d7bee5899d931f926e5c9512e2b442749 +export FUELMENU_COMMIT=e071216cb214e34b4d861478033425ee6a54a3be +export SHOTGUN_COMMIT=63645dea384a37dde5c01d4f8905566978e5d906 +export NETWORKCHECKER_COMMIT=a43cf96cd9532f10794dce736350bf5bed350e9d +export FUELUPGRADE_COMMIT=616a7490ec7199f69759e97e42f9b97dfc87e85b + DOCKER_REPO := http://get.docker.com/builds/Linux/x86_64 DOCKER_TAG := docker-latest diff --git a/build/fuel-main_repo_versions.patch b/build/fuel-main_repo_versions.patch deleted file mode 100644 index 85e3f6a35..000000000 --- a/build/fuel-main_repo_versions.patch +++ /dev/null @@ -1,41 +0,0 @@ -*** config.mk.orig 2016-02-05 10:22:27.140478208 +0100 ---- config.mk 2016-02-05 10:38:27.190405064 +0100 -*************** -*** 86,103 **** - NO_UI_OPTIMIZE:=0 - - # Repos and versions -! FUELLIB_COMMIT?=stable/8.0 -! NAILGUN_COMMIT?=stable/8.0 -! PYTHON_FUELCLIENT_COMMIT?=stable/8.0 -! FUEL_AGENT_COMMIT?=stable/8.0 -! FUEL_NAILGUN_AGENT_COMMIT?=stable/8.0 -! ASTUTE_COMMIT?=stable/8.0 -! OSTF_COMMIT?=stable/8.0 -! FUEL_MIRROR_COMMIT?=stable/8.0 -! FUELMENU_COMMIT?=stable/8.0 -! SHOTGUN_COMMIT?=stable/8.0 -! NETWORKCHECKER_COMMIT?=stable/8.0 -! FUELUPGRADE_COMMIT?=stable/8.0 - - FUELLIB_REPO?=https://github.com/openstack/fuel-library.git - NAILGUN_REPO?=https://github.com/openstack/fuel-web.git ---- 86,103 ---- - NO_UI_OPTIMIZE:=0 - - # Repos and versions -! FUELLIB_COMMIT?=f2ed8e4503dd9641b70b94381d30e21689b8e5c9 -! NAILGUN_COMMIT?=baec8643ca624e52b37873f2dbd511c135d236d9 -! PYTHON_FUELCLIENT_COMMIT?=4f234669cfe88a9406f4e438b1e1f74f1ef484a5 -! FUEL_AGENT_COMMIT?=658be72c4b42d3e1436b86ac4567ab914bfb451b -! FUEL_NAILGUN_AGENT_COMMIT?=b2bb466fd5bd92da614cdbd819d6999c510ebfb1 -! ASTUTE_COMMIT?=b81577a5b7857c4be8748492bae1dec2fa89b446 -! OSTF_COMMIT?=3bc76a63a9e7d195ff34eadc29552f4235fa6c52 -! FUEL_MIRROR_COMMIT?=fb45b80d7bee5899d931f926e5c9512e2b442749 -! FUELMENU_COMMIT?=e071216cb214e34b4d861478033425ee6a54a3be -! SHOTGUN_COMMIT?=63645dea384a37dde5c01d4f8905566978e5d906 -! NETWORKCHECKER_COMMIT?=a43cf96cd9532f10794dce736350bf5bed350e9d -! FUELUPGRADE_COMMIT?=616a7490ec7199f69759e97e42f9b97dfc87e85b - - FUELLIB_REPO?=https://github.com/openstack/fuel-library.git - NAILGUN_REPO?=https://github.com/openstack/fuel-web.git |