summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValeriy Sakharov <vsakharov@mirantis.com>2016-09-21 11:41:23 +0300
committerVladimir Kozhukalov <vkozhukalov@mirantis.com>2017-02-14 12:18:04 +0000
commit10f5d75a4a356c2700b7b6fa8f378b0d13581145 (patch)
tree33300c4c4cdca31d73fb9188da9e445ab840b9a5
parent3aaacb211d6726700ca18a4b9bc43309ceeb5f2d (diff)
Make sure the ISO tracks the latest merged code
After MOS 9.0 release main repositories are now freezed, and the latest merged code lands into -proposed. Thus to keep development and CI for stable/mitaka branch packages from proposed should be added to the ISO. Change-Id: I5f63ec2921e96e7efbb383eb4a92a40e2ab900bd Closes-bug: #1619309 (cherry picked from commit 7c45cbe6133004873510985b48cb967de3263e95)
Notes
Notes (review): Code-Review+2: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Workflow+1: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 14 Feb 2017 12:18:30 +0000 Reviewed-on: https://review.openstack.org/433616 Project: openstack/fuel-main Branch: refs/heads/master
-rw-r--r--00-debmirror.patch13
-rw-r--r--mirror/ubuntu/module.mk35
2 files changed, 36 insertions, 12 deletions
diff --git a/00-debmirror.patch b/00-debmirror.patch
new file mode 100644
index 0000000..46302cb
--- /dev/null
+++ b/00-debmirror.patch
@@ -0,0 +1,13 @@
1diff --git a/debmirror b/debmirror
2index 0c2543c..f2fdd61 100755
3--- a/debmirror
4+++ b/debmirror
5@@ -2116,7 +2116,7 @@ sub name_release {
6
7 if ($origin eq "none") {
8 $codename = $dist_raw;
9- } elsif ($origin eq "Ubuntu" or $origin eq "Canonical") {
10+ } elsif ($origin eq "Ubuntu" or $origin eq "Canonical" or $origin eq "Mirantis") {
11 if ($suite) {
12 say("Ubuntu Release file: using Suite ($suite).");
13 $codename = $suite;
diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
index 7a9466e..5f0dcce 100644
--- a/mirror/ubuntu/module.mk
+++ b/mirror/ubuntu/module.mk
@@ -24,7 +24,18 @@ Architectures: $(UBUNTU_ARCH)
24VerifyRelease: blindtrust 24VerifyRelease: blindtrust
25endef 25endef
26 26
27 27define do_debmirror
28set -ex; ./debmirror --progress --checksums --nocleanup \
29 --nosource --ignore-release-gpg --rsync-extra=none \
30 --exclude-deb-section='^debug$$' \
31 --method=$(MIRROR_MOS_UBUNTU_METHOD) \
32 --host=$(MIRROR_MOS_UBUNTU) \
33 --root=$(MIRROR_MOS_UBUNTU_ROOT) \
34 --dist=$(MIRROR_MOS_UBUNTU_SUITE)$1 \
35 --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
36 --arch=$(UBUNTU_ARCH) \
37 $(LOCAL_MIRROR_UBUNTU)/
38endef
28 39
29# Two operation modes: 40# Two operation modes:
30# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server 41# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
@@ -53,6 +64,11 @@ $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
53 sh -c "$${config_reprepro}" 64 sh -c "$${config_reprepro}"
54 $(ACTION.TOUCH) 65 $(ACTION.TOUCH)
55 66
67$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done:
68 cp /usr/bin/debmirror .
69 patch -p1 ./debmirror < ./00-debmirror.patch
70 $(ACTION.TOUCH)
71
56$(BUILD_DIR)/mirror/ubuntu/reprepro.done: \ 72$(BUILD_DIR)/mirror/ubuntu/reprepro.done: \
57 $(BUILD_DIR)/mirror/ubuntu/mirror.done \ 73 $(BUILD_DIR)/mirror/ubuntu/mirror.done \
58 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done 74 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
@@ -71,17 +87,12 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
71 rm -rf $(LOCAL_MIRROR_UBUNTU)/lists 87 rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
72 $(ACTION.TOUCH) 88 $(ACTION.TOUCH)
73 89
74$(BUILD_DIR)/mirror/ubuntu/mirror.done: 90$(BUILD_DIR)/mirror/ubuntu/mirror.done: \
91 $(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done
75 mkdir -p $(LOCAL_MIRROR_UBUNTU) 92 mkdir -p $(LOCAL_MIRROR_UBUNTU)
76 set -ex; debmirror --progress --checksums --nocleanup \ 93 $(call do_debmirror)
77 --nosource --ignore-release-gpg --rsync-extra=none \ 94 -$(call do_debmirror,-proposed)
78 --exclude-deb-section='^debug$$' \ 95 -$(call do_debmirror,-updates)
79 --method=$(MIRROR_MOS_UBUNTU_METHOD) \ 96 -$(call do_debmirror,-security)
80 --host=$(MIRROR_MOS_UBUNTU) \
81 --root=$(MIRROR_MOS_UBUNTU_ROOT) \
82 --dist=$(MIRROR_MOS_UBUNTU_SUITE) \
83 --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
84 --arch=$(UBUNTU_ARCH) \
85 $(LOCAL_MIRROR_UBUNTU)/
86 rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project 97 rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
87 $(ACTION.TOUCH) 98 $(ACTION.TOUCH)