1 From: Michal Skalski <mskalski@mirantis.com>
2 Date: Wed, 8 Jun 2016 00:54:57 +0200
3 Subject: [PATCH] Build local mirrors for stable/mitaka
7 Change-Id: I3128652aeb87cb2cfaa91ded1b8d9ebeeb70d33b
8 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
11 build/bootstrap_admin_node.sh.patch | 22 ++++++++++++
12 build/f_isoroot/Makefile | 4 +-
13 build/f_isoroot/f_odlpluginbuild/Makefile | 1 +
14 build/f_isoroot/f_repobuild/Makefile | 2 +-
15 .../f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 36 +++++++++++---------
16 6 files changed, 50 insertions(+), 19 deletions(-)
18 diff --git a/build/Makefile b/build/Makefile
19 index fdfb239..956183c 100644
22 @@ -24,6 +24,10 @@ export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
23 export PRODNO = "OPNFV_FUEL"
24 export REVSTATE = "P0000"
25 export USER ?= $(shell whoami)
26 +export BUILD_DATE = $(shell date --utc +%Y-%m-%d:%H:%M)
27 +export OPNFV_GIT_SHA = $(shell git rev-parse HEAD)
28 +# Store in /etc/fuel_build_id on fuel master
29 +export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA)
31 ifdef BUILD_FUEL_PLUGINS
32 $(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
33 diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
34 index aeef3f7..e137b74 100644
35 --- a/build/bootstrap_admin_node.sh.patch
36 +++ b/build/bootstrap_admin_node.sh.patch
38 # Give user 15 seconds to enter fuelmenu or else continue
45 + # Enable online base MOS repos (security, updates) if we run an ISO installation
46 +! [ -f /etc/fuel_build_id ] && \
47 +! yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
49 + if [ ! -f "${ASTUTE_YAML}" ]; then
50 + echo ${fuelmenu_fail_message}
55 ++ # OPNFV: Disabled to speedup installation in offline env.
56 + # Enable online base MOS repos (security, updates) if we run an ISO installation
57 +! #[ -f /etc/fuel_build_id ] && \
58 +! # yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
60 + if [ ! -f "${ASTUTE_YAML}" ]; then
61 + echo ${fuelmenu_fail_message}
64 [ ! -f /etc/fuel_build_id ] && \
65 sed -i "s|127.0.0.1:8080/ubuntu/x86_64|mirror.fuel-infra.org/mos-repos/ubuntu/${FUEL_RELEASE}|g" "${ASTUTE_YAML}"
66 diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
67 index 17ebef3..ed54e70 100644
68 --- a/build/f_isoroot/Makefile
69 +++ b/build/f_isoroot/Makefile
70 @@ -23,10 +23,10 @@ export PLUGINS
71 ifdef BUILD_FUEL_PLUGINS
72 export BUILD_FUEL_PLUGINS
73 #SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)
74 -SUBDIRS = f_kscfg f_bootstrap f_isolinux $(BUILD_FUEL_PLUGINS)
75 +SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)
76 $(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
78 -SUBDIRS = f_kscfg f_bootstrap f_isolinux $(PLUGINS)
79 +SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS)
81 SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
83 diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
84 index efea0f5..c5978de 100644
85 --- a/build/f_isoroot/f_odlpluginbuild/Makefile
86 +++ b/build/f_isoroot/f_odlpluginbuild/Makefile
87 @@ -18,6 +18,7 @@ all: .odlbuild
89 @rm -f .odlbuild ../release/opnfv/opendaylight*.rpm opendaylight*.rpm
90 @rm -f $(BUILD_BASE)/gitinfo_odlplugin.txt gitinfo_odlplugin.txt
91 + @rm -rf fuel-plugins
95 diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
96 index e95dbf2..5277218 100644
97 --- a/build/f_isoroot/f_repobuild/Makefile
98 +++ b/build/f_isoroot/f_repobuild/Makefile
99 @@ -47,7 +47,7 @@ nailgun:
103 - @rm -rf ../release/opnfv/nailgun nailgun fuel-mirror
104 + @rm -rf ../release/opnfv/nailgun nailgun fuel-mirror opnfv-config.yaml ubuntu.yaml
108 diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
109 index aa12c45..d8fab97 100644
110 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
111 +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
114 root_ssh_authorized_file: /root/.ssh/id_rsa.pub
115 extend_kopts: "biosdevname=0 net.ifnames=1 debug ignore_loglevel log_buf_len=10M print_fatal_signals=1 LOGLEVEL=8"
116 + ubuntu_release: trusty
118 - /usr/share/fuel_bootstrap_cli/files/trusty
120 kernel_flavor: linux-image-generic-lts-trusty
128 + - linux-firmware-nonfree
129 + - linux-headers-generic
131 + - live-boot-initramfs-tools
139 + - multipath-tools-boot
150 - - live-boot-initramfs-tools
154 - - linux-firmware-nonfree
155 - - linux-headers-generic
161 bootstrap_images_dir: /var/www/nailgun/bootstraps
162 active_bootstrap_symlink: /var/www/nailgun/bootstraps/active_bootstrap
165 section: "main restricted"
166 uri: "http://127.0.0.1:8080/ubuntu/x86_64"
171 - skip_default_img_build: true
172 + skip_default_img_build: false
173 direct_repo_addresses: