94 Commits

Author SHA1 Message Date
Jenkins
c18b9c3851 Merge "fix the custom profile raise exception issue" 2016-02-20 16:36:59 +00:00
Jenkins
4b0b7931e6 Merge "Fix image plugin functionality for oslo.config" 2016-02-20 16:36:52 +00:00
Éric Lemoine
ee95dc5c27 Add a Dockerfile for Heka
Partially implements: blueprint heka
Change-Id: Iafe0dba1333f1f84bc5956890c3b7a0c2a45cef3
2016-02-19 19:23:49 +00:00
SamYaple
2c45bef065 Reduce gate resource usage
Change-Id: Ic6cd45ec708efe4f573e19f3bc910717ac3b4fbb
Partially-Implements: blueprint functional-testing-gate
2016-02-16 15:12:38 +00:00
Jenkins
84f43146dc Merge "Use uppercase 'S' in word "OpenStack"" 2016-02-15 16:23:37 +00:00
venkatamahesh
70de590a11 Use uppercase 'S' in word "OpenStack"
Change-Id: I27ca0ea75f3d6a4371c91b3cb2c7a999ec90fbc4
2016-02-15 12:37:30 +00:00
Jeffrey Zhang
da0f0cf1e6 fix the custom profile raise exception issue
Closes-Bug: #1536272
Change-Id: I6c91e522923eade16ba23711e6014e6b4b8cd3e0
2016-02-15 15:25:15 +08:00
Paul Bourke
477fc18bd0 Fix image plugin functionality for oslo.config
The new oslo.config style parsing for kolla-build.conf stopped plugins
from working. This patch fixes it and adds a unit test.

Co-Authored-By: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Closes-Bug: 1534556
Change-Id: I135797c733ae0cae040a009c364073769b19e4eb
2016-02-12 06:00:20 +00:00
Jeffrey Zhang
ce5e8a8257 Remove data docker image
we have moved to named volume, the old data container should be removed

TrivialFix

Change-Id: Ib73205de6566509492568381179814baa7af2d22
2016-02-10 22:46:22 +08:00
Jenkins
b891afd64c Merge "Rename kolla_ansible to kolla_toolbox" 2016-02-05 15:04:37 +00:00
Jenkins
16630340c7 Merge "Ubuntu custom apt repos" 2016-02-05 08:28:53 +00:00
Jenkins
e8348d033a Merge "Move the install base type check to kolla-build" 2016-02-04 11:31:01 +00:00
Allen Gao
db53ad1ddf Move the install base type check to kolla-build
The install type is converted in kolla-build, so it will never
fail in dockerfile, move the check to kolla-build just above
the install type converting.

TrivialFix

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: I1500d3b47e909f94ea9f68c5245297733f63a70b
2016-02-04 16:48:12 +08:00
SamYaple
9dae768e69 Ubuntu custom apt repos
Change-Id: I3afb8a29c4ae2369f29e0cc94d75ff8a3c42594b
Implements: blueprint custom-repos
2016-02-03 15:56:54 +00:00
Allen Gao
682b60b861 Fix config help message
Adding the necessary spaces.
TrivialFix

Change-Id: I3858ed1cb978bcf8aefd4a85f7c802607876b36e
2016-02-03 18:11:21 +08:00
SamYaple
80b7266ed1 Rename kolla_ansible to kolla_toolbox
This change is needed for clarity. We have a kolla-ansible script.
We have a kolla-mesos repo. We plan to have a kolla-ansible repo.
Already we have had far too much confusion about whether we are
talking about the container or the project. Naming this kolla-toolbox
eliminates all of that confusion and its probably a bit more accurate
of a name too.

Closes-Bug: #1541053
Change-Id: I8fd1f49d5a22b36ede5b10f46b9fe02ddda9007e
2016-02-02 18:12:15 +00:00
SamYaple
9e98149b3c Removed unused containers from gate build
TrivialFix

Change-Id: I7ccbecddc55b26d252b92faccec94676315c3eec
2016-01-29 20:39:55 +00:00
Jenkins
87355c231a Merge "Pick up proxy buildargs from environment" 2016-01-26 11:50:04 +00:00
David Moreau Simard
c15df14737 Bump RDO delorean repositories to current-passed-ci for Mitaka
RDO now has regular and good coverage which leads to tested
repository promotion to current-passed-ci.
Bumping to current-passed-ci should lead to less errors and
instability.

Change-Id: Ifb68a26afe0062a27303553b8116a3c739aa33c6
2016-01-25 22:09:21 +00:00
Jenkins
d3756de84c Merge "Import modules rather than objects" 2016-01-20 17:31:55 +00:00
Jenkins
08f907a2cc Merge "Add Dockerfiles for Mesos" 2016-01-20 16:23:43 +00:00
Jeffrey Zhang
f7f2194967 Import modules rather than objects
Base on the OpenStack Style Guidelines[0]: Do not import objects, only
modules

[0] http://docs.openstack.org/developer/hacking/index.html#imports

TrivialFix

Change-Id: Id1bc5e4b24fd561f1a9f6167af341b00a343a718
2016-01-20 20:46:12 +08:00
Michal Rostecki
679014a052 Add Dockerfiles for Mesos
Change-Id: Iaf317817eccaa72f2a86b1058a0179afd3427859
Partially-Implements: blueprint mesos
2016-01-19 17:34:58 +01:00
Jenkins
11cdd5b8ea Merge "Expose the docker build_arg to build.py" 2016-01-19 09:51:47 +00:00
Jenkins
5bce0212b2 Merge "add unittest code base" 2016-01-19 09:50:56 +00:00
Jenkins
5c4c8636ff Merge "Add manila container (source only)" 2016-01-19 07:13:52 +00:00
Marc Koderer
f7085c1f6f Add manila container (source only)
Support manila as container. First step only supports
building from source.

Change-Id: I60bb67536c9afdb9f0532b3cdc2c400a68608003
Partially-Implements: blueprint enable-manila-containers
2016-01-18 20:33:32 +00:00
Paul Bourke
b82111d589 Pick up proxy buildargs from environment
We currently support any buildarg via --build-args. This patch picks up
the default supported proxy buildargs if set in the user's environment,
to allow for more transparent proxy support.

The --build-args will take precendence.

DocImpact
Implements blueprint: better-proxy-support

Change-Id: I084e5d1cc8f9993d65167878f9983ad58a68e86e
2016-01-18 11:53:25 +00:00
Jeffrey Zhang
7093d37f18 Expose the docker build_arg to build.py
With this implement, we can add variables at building stage.
For example, add HTTP_PROXY and NO_PROXY when needed like below.

    build.py --build-args \
        HTTP_PROXY:http://127.0.0.1:8080,NO_PROXY:127.0.0.1

More info about build_arg, pls check[0]

[0] https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables-build-arg

DocImpact

Implements: bp add-buildargs
Change-Id: I29ed7f536670fef59d697603dc562a69d90743c9
2016-01-18 11:42:00 +00:00
Jeffrey Zhang
d4490ea2bc add unittest code base
* add a base TestCase class
* load the tests from the project root rather than only tests dir
* add a test case for WorkerThread builder function

Change-Id: Icf878f9249b475a311123c8235c42b1212d02ca6
Partially-implements: bp add-ut-codebase
2016-01-18 11:42:00 +00:00
ting.wang
defd70cef9 Use dict.items() for adding Python 3 compatibility
Replacing dict.iteritems()/.itervalues() with
six.iteritems(dict)/six.itervalues(dict) was preferred in the past,
but there was a discussion suggesting to avoid six for this.

ref:
http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html

Partially implements: blueprint python3
Change-Id: Ie931bc02f558f6db3677b44f645eb3bdf78ccae8
2016-01-16 13:44:16 +08:00
Jeffrey Zhang
4bdf8bfa84 Add trove source url and location
TrivalFix

Change-Id: I70c80d0090c35ffd6e4bf2866510b383d8486220
2016-01-09 18:25:03 +08:00
Jenkins
cd315c659d Merge "Fix the base-tag name in build.py script" 2016-01-08 17:52:20 +00:00
Jenkins
459d564573 Merge "Fix the package source don't register issue" 2016-01-08 03:21:49 +00:00
Jeffrey Zhang
8ba800f4ed Fix the base-tag name in build.py script
TrivialFix

Change-Id: Icfcb0736ab167c0c7acb0eeea98ffd136a8a760b
2016-01-08 09:39:36 +08:00
Jeffrey Zhang
9b19db099d Fix the package source don't register issue
Closes-Bug: #1531848
Change-Id: I3c6ceb9f1f367b8b19ab1b1d06c67817ab93cabb
2016-01-07 21:06:22 +08:00
Jenkins
90e178b57e Merge "Log information about successful push only if it really is" 2016-01-07 08:41:39 +00:00
SamYaple
ea5fa4e248 Fix broken local and global building
Two things broke in the related patches. This patch aims to fix that.

1) tools/build.py was no longer usable as it imported kolla from the
global pip install source. If that didnt exist (because kolla wasn't
installed with pip) then it breaks on import.

2) When kolla was installed globally it looked up the path that
matched the installation of docker-py instead of looking up a path
that had the stuff we wanted (kolla images directory)

Change-Id: I94f1856547ce54d506de72926b08c966a36ac608
Related-Id: I05f10d13e7ba1e2b985c2944aec71ce55630442b
Related-Bug: #1530256
Closes-Bug: #1531569
2016-01-07 03:08:14 +00:00
Michal Rostecki
7137212ab2 Log information about successful push only if it really is
The try-except-finally block in push thread was catching only
ConnectionError and logging information about successful push
even if some other error occured during push.

TrivialFix

Change-Id: I94f5ed67237d291701469a65f76146881cd67a35
2016-01-06 20:29:55 +01:00
Jenkins
ecfc955a7e Merge "Fix the kolla to find the docker image folder in virtualenv" 2016-01-06 14:53:58 +00:00
Jeffrey Zhang
f2bded7f94 Gen the image dependency in the Graphviz dot format
By using

    ./tools/build.py --save-dependency a.dot

to gen the Graphviz dot dependency file. Later, you can use the `dot`
to draw the picture.

    dot -Tjpg -o a.jpg a.dot

Implements: blueprint images-dependency-tree
Depends-On: I8e07a1b69fab5f1c587470bfd2104aaba93f0050
Change-Id: If00f4f3fb9d0b10a07ab2abb7ffb1cd9d64902f2
2016-01-06 16:33:05 +08:00
Jenkins
8123dbdc62 Merge "Generate the kolla-build.conf file using oslo_config" 2016-01-06 06:11:48 +00:00
Jenkins
eda2b56e3c Merge "Do not truncate the error messages" 2016-01-06 01:33:48 +00:00
Jeffrey Zhang
e32f5c52a4 Fix the kolla to find the docker image folder in virtualenv
Closes-Bug:#1530256
Change-Id: I05f10d13e7ba1e2b985c2944aec71ce55630442b
2016-01-06 08:11:06 +08:00
Jeffrey Zhang
620d610eaa Generate the kolla-build.conf file using oslo_config
Closes-Bug: #1530122
Change-Id: I96039eade2aacf1bcd9d14d958cdddd915fc9a5c
2016-01-06 08:11:06 +08:00
Wanlong Gao
d56c8042d8 Do not truncate the error messages
Do not truncate the error messages of build failure images.

TrivialFix
Change-Id: I4f2da78c57c8d919beba84a10357312bfc66e88c
Closes-Bug: #1531152
2016-01-06 07:26:06 +08:00
Wanlong Gao
7f001265e7 Replace xrange() with range() in six.moves
range maps to xrange() and range() in python2 and python3 respectively.

TrivialFix
Change-Id: I9b2477a17a570c3ce945badacbfa44889c0634a9
2016-01-05 20:29:15 +08:00
Wanlong Gao
7575ac4a49 Use range() from six.moves
To improve consistency, use range() from six.moves

TrivialFix
Change-Id: I3bb67b2bb5bedbc5b46f70d7eeeca7f8b7872250
2016-01-05 20:29:02 +08:00
Jenkins
d08db850ec Merge "use oslo.config instead of raw argparse.ArgumentParser" 2015-12-31 07:35:05 +00:00
Jeffrey Zhang
3b3d6df0c2 use oslo.config instead of raw argparse.ArgumentParser
* Use oslo.config library
* kolla-build section is deprecated in favor of DEFAULT section
* Remove the deprecated `--template` option
* `--no-cache` is deprecated in favor of `--cache` and `--nocache`
  options, which are using oslo BoolOpt inverse feature[0]

[0] https://github.com/openstack/oslo.config/blob/master/oslo_config/cfg.py#L1074

Closes-Bug: #1528542
Change-Id: I62c5ca3c8e057917d2798256e9d9efc8f6578f60
2015-12-30 18:53:05 +08:00