diff options
| author |   Stefan Berg <stefan.k.berg@ericsson.com> | 2016-02-05 23:27:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-05 23:27:19 +0000 |
| commit | 03822a6ab8426d2d54fb05b645a8ef33d5dd51f1 (patch) | |
| tree | 3cd8b7bd2a014afdf5e2871ae64fce12524ba9c7 | |
| parent | 2cfea00a2ef413e7fb95c25eb327db366b242f0a (diff) | |
| parent | ac2690bf4c2d2a2c904c5ce136eda8e49705300d (diff) | |
Merge "Pin down exact Fuel repo versions" into stable/brahmaputra
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/config.mk | 2 | ||||
| -rw-r--r-- | build/fuel-main_repo_versions.patch | 41 |
3 files changed, 44 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile index bc6a9418c..de3031269 100644 --- a/build/Makefile +++ b/build/Makefile @@ -105,6 +105,8 @@ $(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 eca426773..aa2f5a658 100644 --- a/build/config.mk +++ b/build/config.mk @@ -9,7 +9,7 @@ ############################################################################## FUEL_MAIN_REPO := https://github.com/openstack/fuel-main -FUEL_MAIN_TAG = stable/8.0 +FUEL_MAIN_TAG = a365f05b903368225da3fea9aa42afc1d50dc9b4 MOS_VERSION = 8.0 OPENSTACK_VERSION = liberty-8.0 diff --git a/build/fuel-main_repo_versions.patch b/build/fuel-main_repo_versions.patch new file mode 100644 index 000000000..85e3f6a35 --- /dev/null +++ b/build/fuel-main_repo_versions.patch @@ -0,0 +1,41 @@ +*** 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 |