30 Commits

Author SHA1 Message Date
Jeffrey Zhang
156abd6b6a Remove no-cache option in build.py
no-cache is marked for removal. we should move to cache parameter
instead. Ie6d5ab380a22c32eb6a5cee29ff7912e9f4cfe74 handle this parameter
for mistak.

TrivialFix

Change-Id: I4a6bc3eca07e9930381091fcf735529019523975
2016-09-20 13:48:49 +08:00
Jenkins
afe4209bb2 Merge "Add iter function to change list into iterator" 2016-09-14 09:49:05 +00:00
gong yong sheng
2660bbee8f Call filter_images before save dependencies
save_dependency function needs the image status which is set
by filter_images.

Change-Id: I7aa097c94d59de9389d8a53babe63d8b991a6e23
Closes-bug: 1623291
2016-09-14 10:46:04 +08:00
gong yong sheng
dd57e1df5a Add iter function to change list into iterator
Change-Id: Ia141a54b1bc0b1742a396b7029ee0b56ead648db
Closes-bug: 1623288
2016-09-14 10:04:10 +08:00
Jenkins
8d5080407e Merge "Add extra methods in template when using template override" 2016-09-13 14:31:00 +00:00
Vladislav Belogrudov
80bdb458ee Build process outputs each line twice
Don't propagate logs going to stdout to avoid duplicate messages

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: I52da42adc40aa5d468d1c0c1134e65689916a2a8
Closes-Bug: #1620239
2016-09-13 07:15:34 +00:00
Jeffrey Zhang
754a0cef25
Add extra methods in template when using template override
Add the Kolla template methods when using --template-override parameter

TrivialFix

Change-Id: I67ab579817fc5462143e5742d78db4a202debf2e
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
2016-09-07 20:20:27 +08:00
Christian Berendt
e821f58c9b Install neutron-lbaas-dashboard from source in horizon container
Change-Id: I9bc0288dd436eaaa48c8fd27e0907bbb8dadfe2c
Partial-bug: #1592446
Co-authored-by: Shaun Smekel <shaun.smekel@theorem.net.au>
2016-08-31 12:48:18 +00:00
Jenkins
20706e223d Merge "Remove log propagate configuration" 2016-08-23 12:02:31 +00:00
Lu lei
2fb98a6b82 py3:Remove six.iterXXX
1、As mentioned in [1], we should avoid using six.iteritems/keys
   achieve iterators. We can use dict.items/keys instead, as it
   will return iterators in PY3 as well. And dict.items/keys will
   more readable.
2、In py2, the performance about list should be negligible,
   see the link [2].

  [1] https://wiki.openstack.org/wiki/Python3
  [2] http://lists.openstack.org/pipermail/openstack-dev/
      2015-June/066391.html

TrivialFix.

Change-Id: I0cbe8af3210233a58d25f0df187c3d085405aa2a
2016-08-23 14:34:35 +08:00
Jeffrey Zhang
9946b566d5 Remove log propagate configuration
Disable the log propagate for all logger is bad.

TrivialFix

Change-Id: I5e9a3356c7a34710ac2c020fa32370b5172411d2
2016-08-21 00:54:01 +00:00
Jenkins
9a7e4c1592 Merge "Skips a debug log during image build" 2016-08-18 03:08:45 +00:00
Sajauddin Mohammad
dbc50ab246 Skips a debug log during image build
Added a condition to skip debug message during image build, when the 
base image is dependent on image of other service

Closes-Bug: #1513904. 
  
Change-Id: I68d568981cebf442b34c958e125b0f921b883247
2016-08-16 10:34:33 +00:00
Abe Music
29fcb04cf3 enhancements to install_packages macro
- Adds debian_package_install method to the jinja environment
  that will return the necessary set of commands needed to
  install packages via apt-get and/or URLs to .deb packages
- Updates install_packages macro to make use of the method
  above

Change-Id: Ie9318a7def54b5034ba91375fd8fd3b589d18349
Partially-implements: blueprint third-party-plugin-support
2016-08-15 08:17:13 -05:00
Swapnil Kulkarni (coolsvap)
843f934ede Make kolla-build list-dependencies option work
Change-Id: I465cc8a79b12c188569c9537e14763a6bef8dd43
Closes-Bug:#1606450
2016-07-27 12:37:11 +05:30
qinchunhua
9f596ffe4f Fix dict.values() PY3 compatible
The dict.values()[0] will raise a TypeError in PY3
as dict.values() doesn't return a list any more in PY3
but a view of list.

TrivialFix.

Change-Id: I01297bb68e45db4d15800d2d42e08560da7346bd
2016-07-27 03:55:51 +00:00
Joshua Harlow
43a38c179a Fix broken save,list images/dependencies options
It's sorta required to actually build the image
list (and strucutre) to make any of these commands
do anything.

TrivalFix

Change-Id: Ib601bd4d2cc84af6d35a8623b77f9b512124d2ad
2016-06-29 17:53:14 -07:00
Joshua Harlow
3bd1f14c4f Be smarter about what to do when making a docker client
Instead of having the program sys.exit when a docker
client object can not be created (which kills all the threads
and messes up the program and its associated state) have a
exception be raised when this (for whatever reason) fails.

Also refactor so that there is a docker task that the docker
client using tasks can all inherit from.

TrivalFix

Change-Id: Ie81aff10cfe6f2fc5c65d53402200e3928fb460c
2016-06-27 14:09:25 -07:00
Jenkins
01d183da27 Merge "Stop using a global logger for all the things" 2016-06-27 06:48:08 +00:00
Michal (inc0) Jastrzebski
dfb0e55740 Customizations continued
To correctly customize lists, we need to specify *_append, *_remove or
*_override variable in customization file.

Change-Id: I18d67ab89089e2696399ff1b99c1047a2f554442
Partially-implements: blueprint third-party-plugin-support
2016-06-24 13:56:20 +00:00
Paul Bourke
3af14c3402 Update urls for Delorean repo files
delorean.repo is now redirected from trunk.rdoproject.org to
buildlogs.centos.org [0]

[0] https://www.redhat.com/archives/rdo-list/2016-June/msg00206.html

Closes-Bug: 1595568

Change-Id: I650abc34d9cf0c00f9025bd2c62f1bf03fbd96b7
2016-06-24 11:19:00 +01:00
Joshua Harlow
929d84b143 Stop using a global logger for all the things
Instead of using the same logger for all the things
which makes it incredibly hard to figure out what the images
and there builds are doing; instead have it so that each
image gets its own logger which is then used by tasks that
process that image.

Each images logs now will (optionally) go to a logs directory
that can be more easily read and looked over and leaves
the main logger for informational/task kind of
output only.

Closes-Bug: #1586478

Change-Id: I939e073a2bc5ed8b5a1e969888fc743d80f468c9
2016-06-21 15:25:05 -07:00
Michal (inc0) Jastrzebski
f1c3422582 Macro install packages
Simplification of package installations

Change-Id: I78c0a84c55e891dec7c9bd21bc61700dba244526
Partially-implements: blueprint third-party-plugin-support
2016-06-15 19:42:02 +00:00
TuanLAF
3772ac05f7 Fix typos in Kolla
TrivialFix

Change-Id: Id916352b419a100d1cae463031e3182bd1080776
2016-06-13 17:46:42 +07:00
Jenkins
9afb69c8de Merge "Mechanism for Dockerfile customization" 2016-06-12 23:58:54 +00:00
Jenkins
319fd3e794 Merge "Add non-intrusive ctrl-c handling" 2016-06-10 03:14:05 +00:00
Joshua Harlow
869e117b53 Add non-intrusive ctrl-c handling
Instead of trying to use a signal handler to stop
when ctrl-c is triggered use technique that cooperates
better with the threads that are running and lets
them die a happy death vs being forced to die in
unpleasant ways.

Closes-Bug: #1586476

Change-Id: I7fdb6a77a144bdd02276cca07b616bbb0c2f1957
2016-06-08 22:00:25 -07:00
Joshua Harlow
a45dc94e8c Use 'image' not 'item'
The things in self.images are images, not items so
reflect these to use the shared 'image' name vs
having a one-off that uses 'item'.

TrivalFix

Change-Id: I781514d3e116de32b4fe61a7f55455282680fec1
2016-06-08 17:50:39 -07:00
Michal (inc0) Jastrzebski
51074b0a42 Mechanism for Dockerfile customization
This patchset enables potentially full customization of Dockerfiles
provided by Kolla without having to change main Kolla code. Mechanism is
based on jinja2 block mechanism. In our dockerfiles we'll add blocks
(mostly empty) with highly standarized naming, then in override file
users will be able to fill/override contents of these blocks. Example is
shown in this patch.
To enable cutomized override file call build.py

--template-override=path-to-file Only caveat is that header {% extends
.. %} has to stay

Change-Id: I5957024e5652f9677c439fb2fcd524e467b951af
Partially-implements: blueprint third-party-plugin-support
2016-06-07 21:03:51 +00:00
Jeffrey Zhang
c31688be36 Make build.py importable lib
First step to break it down is to make it
importable lib rather than self-contained script.

Change-Id: Ibbc924c2849cc79006046f62f31a1909ce959066
Partially-implements: bp build-refactor
2016-06-07 16:40:16 +00:00