blob: 823bcd9d16b57293f19f787c109e90a7f4186613 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
|
#!/bin/bash -e
##############################################################################
# Copyright (c) 2015 Ericsson AB and others.
# stefan.k.berg@ericsson.com
# jonas.bjurel@ericsson.com
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
my_exit() {
rc=$?
cd /tmp
if [ -n "$TMP_HOSTMOUNT" ]; then
if [ -d "$TMP_HOSTMOUNT" ]; then
fusermount -u $TMP_HOSTMOUNT
rmdir $TMP_HOSTMOUNT
fi
fi
if [ -d "$TMP_OLDISO" ]; then
fusermount -u $TMP_OLDISO
rmdir $TMP_OLDISO
fi
if [ -f "$CONF" ]; then
rm $CONF
fi
if [ -d "$TMP_ISOPUPPET" ]; then
rm -Rf $TMP_ISOPUPPET
fi
}
get_deb_name() {
ar p $1 control.tar.gz | tar xzO ./control | grep "^Package:.* " | sed 's/.* //'
if [ $PIPESTATUS -ne 0 ]; then
echo "Error in get_deb_name($1)"
exit 1
fi
}
get_deb_rev() {
ar p $1 control.tar.gz | tar xzO ./control | grep "^Version:.* " | sed 's/.* //'
if [ $PIPESTATUS -ne 0 ]; then
echo "Error in get_deb_rev($1)"
exit 1
fi
}
# Added logic for ".orig" files:
# 1. Is there an .orig file for the new file?
# 2. If the file is not present in base ISO -> Error!
# 3. If the file is changed i base ISO -> Error! (need manual rebase)
# 4. If there is no .orig file, but file is present in base ISO: Error!
verify_orig_files() {
OLDDIR=$1
NEWDIR=$2
pushd $NEWDIR >/dev/null
for f in $(find * -type f -name '*.orig')
do
origfile=$NEWDIR/$f
oldfile=$OLDDIR/$(echo $f | sed 's/.orig$//')
newfile=$NEWDIR/$(echo $f | sed 's/.orig$//')
origfile=${newfile}.orig
# If no corresponding base file, error
if [ ! -f $oldfile ]; then
printf "\n\n\n\n"
echo "Error: found ${newfile} but no"
echo "Error: ${oldfile}"
echo "Error: Manual rebase is needed!"
printf "\n\n\n\n"
exit 1
fi
# If orig file differs from base file, error
if ! diff -q $origfile $oldfile > /dev/null; then
printf "\n\n\n\n"
echo "Error: $origfile differs from"
echo "Error: $oldfile!"
echo "Error: Manual rebase is needed!"
printf "\n\n\n\n"
exit 1
fi
done
# Check that there we're not overwriting oldfiles without having a ".orig" copy
for f in $(find * -type f ! -name '*.orig')
do
newfile=$NEWDIR/$(echo $f | sed 's/.orig$//')
origfile=${newfile}.orig
oldfile=$OLDDIR/$f
if [ -f $oldfile ]; then
if [ ! -f $origfile ]; then
printf "\n\n\n\n"
echo "Error: Will overwrite $oldfile, but there is no"
echo "Error: $origfile!"
echo "Error: You need to create the `basename $origfile`!"
printf "\n\n\n\n"
exit 1
fi
fi
done
popd >/dev/null
}
prep_make_live() {
DEST=$TMP_HOSTMOUNT
REPO=$DEST/var/www/nailgun/ubuntu/fuelweb/x86_64
echo "Live install"
ssh-copy-id root@$FUELHOST
sshfs root@1${FUELHOST}:/ $TMP_HOSTMOUNT
if [ -f $REPO/dists/precise/main/binary-amd64/Packages.backup ]; then
echo "Error - found backup file for Packages!"
exit 1
fi
if [ -f $REPO/dists/precise/main/binary-amd64/Packages.gz.backup ]; then
echo "Error - found backup file for Packages.gz!"
exit 1
fi
if [ -f $REPO/dists/precise/Release.backup ]; then
echo "Error - found backup file for Release!"
exit 1
fi
if [ -d $DEST/etc/puppet.backup ]; then
echo "Error - found backup file for Puppet!"
exit 1
fi
cp $REPO/dists/precise/main/binary-amd64/Packages $REPO/dists/precise/main/binary-amd64/Packages.backup
cp $REPO/dists/precise/main/binary-amd64/Packages.gz $REPO/dists/precise/main/binary-amd64/Packages.gz.backup
cp $REPO/dists/precise/Release $REPO/dists/precise/Release.backup
cp -Rvp $DEST/etc/puppet $DEST/etc/puppet.backup
}
post_make_live() {
echo "Installing into Puppet:"
cd $TOP/release/puppet/modules
for dir in *
do
echo " $dir"
cp -Rp $dir $DEST/etc/puppet/modules
done
}
make_live() {
prep_make_live
copy_packages
post_make_live
}
prep_make_iso() {
DEST=$TOP/newiso
REPO=$DEST/ubuntu
echo "Making ISO..."
echo "Unpack of old ISO..."
if [ -d newiso ]; then
chmod -R 755 newiso
rm -rf newiso
fi
mkdir newiso
fusermount -u $TMP_OLDISO 2>/dev/null || cat /dev/null
fuseiso -p $ORIGISO $TMP_OLDISO
sleep 1
cd $TMP_OLDISO
find . | cpio -pd $TOP/newiso
cd ..
fusermount -u $TMP_OLDISO
rm -Rf $TMP_OLDISO
chmod -R 755 $TOP/newiso
}
make_iso_image() {
echo "Making ISO..."
cd $DEST
find . -name TRANS.TBL -exec rm {} \;
rm -rf rr_moved
mkisofs --quiet -r -V "$VOLUMEID" -publisher "$PUBLISHER" \
-p `git rev-parse --verify HEAD` -J -R -b isolinux/isolinux.bin \
-no-emul-boot \
-boot-load-size 4 -boot-info-table \
--hide-rr-moved \
-x "lost+found" -o $NEWISO .
isoinfo -d -i $NEWISO
}
# iso_copy_puppet: Create a new puppet-slave.tgz for the iso
iso_copy_puppet() {
echo "Installing into Puppet..."
mkdir -p $TMP_ISOPUPPET/release/puppet
cd $TMP_ISOPUPPET/release/puppet
tar xzf $DEST/puppet-slave.tgz
cd $TOP/release/puppet/modules
verify_orig_files $TMP_ISOPUPPET/release/puppet $TOP/release/puppet/modules
# Remove all .orig files before copying as they now have been verfied
find $TOP/release/puppet/modules -type f -name '*.orig' -exec rm {} \;
for dir in $TOP/release/puppet/modules/*
do
echo " $dir"
cp -Rp $dir $TMP_ISOPUPPET/release/puppet
done
cd $TMP_ISOPUPPET/release/puppet
tar czf $DEST/puppet-slave.tgz .
cd $TOP
rm -Rf $TMP_ISOPUPPET
}
# iso_modify_image: Add/patch files in the ISO root
iso_modify_image () {
# TODO: Add logic for ".orig" files (hey! make a function!), which would look
# something like:
# 1. Is there an .orig file?
# 2. If the file is not present in origiso -> Error exit
# 3. If the file is changed in origiso -> Error exit (need manual rebase)
# 4. Otherwise continue, but don't copy orig file (or maybe we should?)
# ... and corresponding reverse logic:
# 1. If there is no .orig file, but file is present in origiso -> Error exit
echo "Modify ISO files (wild copy)..."
verify_orig_files $DEST $TOP/release/isoroot
# Remove all .orig files before copying as they now have been verfied
find $TOP/release/isoroot -type f -name '*.orig' -exec rm {} \;
cd $TOP/release/isoroot
cp -Rvp . $DEST
}
make_iso() {
prep_make_iso
copy_packages
iso_copy_puppet
iso_modify_image
make_iso_image
}
copy_packages() {
echo "Copying Debian packages..."
cd $TOP/release/packages/ubuntu/pool/main
for deb in `ls -1 | grep '\.deb$'`
do
echo " $deb"
cp $deb $REPO/pool/main
done
echo "Running Fuel package patch file"
pushd $REPO/pool/main > /dev/null
for line in `cat $TOP/apply_patches | grep -v "^#" | grep -v "^$"`; do
echo "Line is $line"
ref=`echo $line | cut -d '>' -f 1`
origpkg=`echo $line| cut -d '>' -f 2`
url=`echo $line | cut -d '>' -f 3`
if [ -z "$origpkg" ]; then
echo "Error: No origpkg for patching"
exit 1
fi
if [ -z "$url" ]; then
echo "Error: No url for patching"
exit 1
fi
if [ -z "$ref" ]; then
echo "Error: No reference text for patching"
exit 1
fi
echo "CM: Patching Fuel package for $ref" | tee -a $REPORTFILE
echo "CM: Replacing package $origpkg with $url" | tee -a $REPORTFILE
oldrev=`get_deb_rev $origpkg`
rm $origpkg
wget --quiet $url
topkg=`basename $url`
echo "CM: MD5 of new package:" | tee -a $REPORTFILE
md5sum $topkg | tee -a $REPORTFILE
patchname=`get_deb_name $topkg`
patchrev=`get_deb_rev $topkg`
echo "Correcting dependencies towards $patchname rev $patchrev - old rev $oldrev" | tee -a $REPORTFILE
$TOP/patch-packages/tools/correct_deps $patchname $oldrev $patchrev | tee -a $REPORTFILE
if [ $PIPESTATUS -ne 0 ]; then
exit 1
fi
done
printf "Done running Fuel patch file\n\n"
echo "Running add packages file"
for line in `cat $TOP/add_opnfv_packages | grep -v "^#" | grep -v "^$"`; do
echo "Line is $line"
ref=`echo $line | cut -d '>' -f 1`
origpkg=`echo $line| cut -d '>' -f 2`
url=`echo $line | cut -d '>' -f 3`
if [ -z "$origpkg" ]; then
echo "Error: No origpkg for patching"
exit 1
fi
if [ -z "$url" ]; then
echo "Error: No url for patching"
exit 1
fi
if [ -z "$ref" ]; then
echo "Error: No reference text for patching"
exit 1
fi
if [ "$origpkg" != "NONE" ]; then
echo "CM: Patching added package for $ref" | tee -a $REPORTFILE
echo "CM: Replacing package $origpkg with $url" | tee -a $REPORTFILE
oldrev=`get_deb_rev $origpkg`
rm $origpkg
else
echo "CM: Adding previoulsy uninstalled package for $ref" tee -a $REPORTFILE
fi
wget --quiet $url
topkg=`basename $url`
echo "CM: MD5 of new package:" | tee -a $REPORTFILE
md5sum $topkg | tee -a $REPORTFILE
if [ "$origpkg" != "NONE" ]; then
patchname=`get_deb_name $topkg`
patchrev=`get_deb_rev $topkg`
echo "Correcting dependencies towards $patchname rev $patchrev - old rev $oldrev" | tee -a $REPORTFILE
$TOP/patch-packages/tools/correct_deps $patchname $oldrev $patchrev | tee -a $REPORTFILE
if [ $PIPESTATUS -ne 0 ]; then
exit 1
fi
fi
done
printf "Done running add packages file\n\n"
popd > /dev/null
if [ -f $TOP/patch-packages/release/patch-replacements ]; then
echo "Applying package patches" | tee -a $REPORTFILE
pushd $REPO/pool/main > /dev/null
printf "\n\n" | tee -a $REPORTFILE
for line in `cat $TOP/patch-packages/release/patch-replacements`
do
frompkg=`echo $line | cut -d ">" -f 1`
topkg=`echo $line | cut -d ">" -f 2`
echo "CM: Applying patch to $frompkg" | tee -a $REPORTFILE
echo "CM: New package rev after patch: $topkg" | tee -a $REPORTFILE
if [ ! -f $frompkg ]; then
echo "Error: Can't find $frompkg in repo"
exit 1
else
oldrev=`get_deb_rev $frompkg`
echo "Removing $frompkg from repo"
rm $frompkg
fi
if [ ! -f $TOP/patch-packages/release/packages/$topkg ]; then
echo "Error: Can't find $topkg in patch release"
exit 1
else
echo "Adding $topkg to repo"
cp $TOP/patch-packages/release/packages/$topkg .
fi
patchname=`get_deb_name $topkg`
patchrev=`get_deb_rev $topkg`
echo "Correcting dependencies towards $patchname rev $patchrev - old rev $oldrev" | tee -a $REPORTFILE
$TOP/patch-packages/tools/correct_deps $patchname $oldrev $patchrev | tee -a $REPORTFILE
if [ $PIPESTATUS -ne 0 ]; then
exit 1
fi
done
popd > /dev/null
fi
echo "Generating metadata..."
pushd $REPO > /dev/null
# The below methods are from 15B
APT_REL_CONF="$TOP/install/apt-ftparchive-release.conf"
APT_DEB_CONF="$TOP/install/apt-ftparchive-deb.conf"
apt-ftparchive -c "${APT_REL_CONF}" generate "${APT_DEB_CONF}"
# Fuel also needs this index file
cat dists/precise/main/binary-amd64/Packages | \
awk '/^Package:/{pkg=$2}
/^Version:/{print pkg ": \"" $2 "\""}' > ubuntu-versions.yaml
cp ubuntu-versions.yaml $DEST
apt-ftparchive -c "${APT_REL_CONF}" release dists/precise/ > dists/precise/Release
gzip -9cf dists/precise/Release > dists/precise/Release.gz
popd > /dev/null
}
#############################################################################
trap my_exit EXIT
CONF=`mktemp /tmp/XXXXXXX`
MODE=$1
TOP=`pwd`
if [ $MODE = "iso" ]; then
PUBLISHER="OPNFV"
TMP_OLDISO=`mktemp -d /tmp/XXXXXXX`
TMP_ISOPUPPET=`mktemp -d /tmp/XXXXXXX`
ORIGISO=$2
NEWISO=$3
VOLUMEID="$4 $5"
REPORTFILE="${NEWISO}.txt"
if [ ! -f $ORIGISO ]; then
echo "Can't find original MOS 5.1 iso at $ORIGISO"
rm $CONF
exit 1
fi
make_iso
else
echo "Unknown mode: $MODE"
exit 1
fi
|