From 967e9a0daa8cefa439bd82186dd2f3f3f3d73a0b Mon Sep 17 00:00:00 2001 From: Sergey Kulanov Date: Thu, 3 Sep 2015 12:38:02 +0300 Subject: [PATCH] Bump to version 8.0 Change-Id: I344d0c11df73fbeaf98058e6490574ae1f7ef2d1 --- config/common.cfg | 4 ++-- config/config.mk | 4 ++-- config/fuel.cfg | 2 +- debian/changelog | 8 ++++++++ debian/conffiles | 14 +++++++------- debian/postinst | 4 ++-- debian/postrm | 4 ++-- debian/rules | 4 ++-- specs/fuel-createmirror.spec | 7 +++++-- 9 files changed, 31 insertions(+), 20 deletions(-) diff --git a/config/common.cfg b/config/common.cfg index 7dba6bf..5f0131e 100644 --- a/config/common.cfg +++ b/config/common.cfg @@ -19,8 +19,8 @@ MIRROR_UBUNTU_HTTPDIR=$MIRROR_UBUNTU_DIR # MOS Ubuntu packages MIRROR_MOS_UBUNTU_HOST="mirror.fuel-infra.org" -MIRROR_MOS_UBUNTU_DIR="mirror/mos-repos/ubuntu/7.0" -MIRROR_MOS_UBUNTU_HTTPDIR="mos-repos/ubuntu/7.0" +MIRROR_MOS_UBUNTU_DIR="mirror/mos-repos/ubuntu/8.0" +MIRROR_MOS_UBUNTU_HTTPDIR="mos-repos/ubuntu/8.0" # Configure repository paths # Format: diff --git a/config/config.mk b/config/config.mk index fe2b17d..e6378e4 100644 --- a/config/config.mk +++ b/config/config.mk @@ -19,7 +19,7 @@ LOCAL_MIRROR:=$(abspath $(LOCAL_MIRROR)) DEPS_DIR?=$(TOP_DIR)/deps DEPS_DIR:=$(abspath $(DEPS_DIR)) -PRODUCT_VERSION:=7.0 +PRODUCT_VERSION:=8.0 # This variable is used for naming of auxillary objects # related to product: repositories, mirrors etc @@ -211,7 +211,7 @@ MIRROR_UBUNTU_SUITE?=$(UBUNTU_RELEASE) MIRROR_UBUNTU_SECTION?=main universe multiverse restricted MIRROR_MOS_UBUNTU_METHOD?=http MIRROR_MOS_UBUNTU?=perestroika-repo-tst.infra.mirantis.net -MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/ubuntu/7.0 +MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/ubuntu/$(PRODUCT_VERSION) MIRROR_MOS_UBUNTU_SUITE?=$(PRODUCT_NAME)$(PRODUCT_VERSION) MIRROR_MOS_UBUNTU_SECTION?=main restricted MIRROR_DOCKER?=http://mirror.fuel-infra.org/fwm/$(PRODUCT_VERSION)/docker diff --git a/config/fuel.cfg b/config/fuel.cfg index 6f9373f..5d42fbb 100644 --- a/config/fuel.cfg +++ b/config/fuel.cfg @@ -3,7 +3,7 @@ if ! hash fuel2 2>/dev/null; then # working outside of Fuel node, set Fuel parameters manually -FUEL_VERSION=7.0 +FUEL_VERSION=8.0 FUEL_SERVER="" # -------------------------------------- diff --git a/debian/changelog b/debian/changelog index cc2f143..2929b6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +fuel-createmirror (8.0-1) experimental; urgency=low + + * Thu Sep 03 2015 skulanov + + - Bump to version 8.0 + + -- skulanov Thu, 03 Sep 2015 12:35:26 +0300 + fuel-createmirror (7.0-2) experimental; urgency=low * Thu Aug 13 2015 vparakhin diff --git a/debian/conffiles b/debian/conffiles index 9490634..46b7904 100644 --- a/debian/conffiles +++ b/debian/conffiles @@ -1,7 +1,7 @@ -/opt/fuel-createmirror-7.0/config/common.cfg -/opt/fuel-createmirror-7.0/config/config.mk -/opt/fuel-createmirror-7.0/config/fuel.cfg -/opt/fuel-createmirror-7.0/config/mos-ubuntu-updatesonly.cfg -/opt/fuel-createmirror-7.0/config/mos-ubuntu.cfg -/opt/fuel-createmirror-7.0/config/requirements-deb.txt -/opt/fuel-createmirror-7.0/config/ubuntu.cfg +/opt/fuel-createmirror-8.0/config/common.cfg +/opt/fuel-createmirror-8.0/config/config.mk +/opt/fuel-createmirror-8.0/config/fuel.cfg +/opt/fuel-createmirror-8.0/config/mos-ubuntu-updatesonly.cfg +/opt/fuel-createmirror-8.0/config/mos-ubuntu.cfg +/opt/fuel-createmirror-8.0/config/requirements-deb.txt +/opt/fuel-createmirror-8.0/config/ubuntu.cfg diff --git a/debian/postinst b/debian/postinst index 3caff52..7c8ca3e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,3 +1,3 @@ #!/bin/bash -ln -sf /opt/fuel-createmirror-7.0/fuel-createmirror /usr/bin/ -ln -sf /opt/fuel-createmirror-7.0/config /etc/fuel-createmirror \ No newline at end of file +ln -sf /opt/fuel-createmirror-8.0/fuel-createmirror /usr/bin/ +ln -sf /opt/fuel-createmirror-8.0/config /etc/fuel-createmirror \ No newline at end of file diff --git a/debian/postrm b/debian/postrm index c30498a..987d17b 100644 --- a/debian/postrm +++ b/debian/postrm @@ -2,8 +2,8 @@ if [ "$1" = "1" ]; then rm -f /usr/bin/fuel-createmirror rm -f /etc/fuel-createmirror - ln -sf /opt/fuel-createmirror-7.0/fuel-createmirror /usr/bin/ - ln -sf /opt/fuel-createmirror-7.0/config /etc/fuel-createmirror + ln -sf /opt/fuel-createmirror-8.0/fuel-createmirror /usr/bin/ + ln -sf /opt/fuel-createmirror-8.0/config /etc/fuel-createmirror else rm -f /usr/bin/fuel-createmirror rm -f /etc/fuel-createmirror diff --git a/debian/rules b/debian/rules index ae8a07f..76cceec 100755 --- a/debian/rules +++ b/debian/rules @@ -24,9 +24,9 @@ binary-arch: build dh_installchangelogs # Copy the packages's files. - mkdir -p debian/$(PACKAGE)/opt/$(PACKAGE)-7.0 + mkdir -p debian/$(PACKAGE)/opt/$(PACKAGE)-8.0 find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \ - xargs -0 -r -i cp -a {} debian/$(PACKAGE)/opt/$(PACKAGE)-7.0 + xargs -0 -r -i cp -a {} debian/$(PACKAGE)/opt/$(PACKAGE)-8.0 # # If you need to move files around in debian/$(PACKAGE) or do some diff --git a/specs/fuel-createmirror.spec b/specs/fuel-createmirror.spec index ce4d873..0ae424b 100644 --- a/specs/fuel-createmirror.spec +++ b/specs/fuel-createmirror.spec @@ -1,6 +1,6 @@ %define name fuel-createmirror -%{!?version: %define version 7.0} -%{!?release: %define release 2} +%{!?version: %define version 8.0} +%{!?release: %define release 1} Name: %{name} Version: %{version} @@ -69,6 +69,9 @@ fi /opt/%{name}-%{version}/README.md %changelog +* Thu Sep 03 2015 Sergey Kulanov +- Bump to version 8.0 + * Thu Aug 13 2015 vparakhin - Switch MOS DEB repos to new format, update configs from fuel-main