summaryrefslogtreecommitdiff
path: root/kolla/image
AgeCommit message (Collapse)AuthorFilesLines
2024-06-06Pin requests to <2.32 for docker sdk (2023.1 and older releases)Bartosz Bezak1-0/+1
As 2023.1 and older releases have docker>=3.0.0,<7.0.0 we need to pin requests to <2.32 due too [1] Also marking collectd as unbuildable to unblock CI [2] [1] https://github.com/docker/docker-py/issues/3256 [2] https://review.opendev.org/c/openstack/kolla/+/918962 Related-Bug: #2066364 Related-Bug: #2065362 Change-Id: Ic298d9eb9d73ee4378921e15865ec11a488f7bd0 (cherry picked from commit b5c936a3a564e10b35b0e378bd6d5034f0db93b4)
2024-05-08Build Bifrost containers from correct tarballsMaksim Malchuk1-0/+3
Since [1] is merged and new tarball (bifrost-unmaintained-zed.tar.gz) is posted [2] fix an issue that containers were built from old tarball (bifrost-stable-zed.tar.gz) still exist on [2]. Also disable build of the Murano images due to [3]. [1]: https://review.opendev.org/c/openstack/bifrost/+/918671 [2]: https://tarballs.opendev.org/openstack/bifrost/ [3]: I3d43519c34b8775a73a311216a945cf69cd89fe4 Change-Id: I7b491f54d78398dadf080532aef694301e0bbe7b Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2023-10-05ubuntu: mark collectd and telegraf as buildableMichal Nasiadka1-2/+0
Closes-Bug: #2019756 Change-Id: Ibf3983f49795eea1f75aa7efb120c812adab4c86 (cherry picked from commit f000360c2d699e5b2bd9bee00e78055deb1540b4)
2023-09-29Revert "bifrost: mark unbuidable for Ubuntu"Michal Nasiadka1-3/+2
This reverts commit 47431082f65d8761a74df40ed18ff3415722ad69. Reason for revert: buildable now Change-Id: Icb23d9280763c7e85f2ca2e0ebf6985d810f27e2
2023-09-05Revert "Disable build of Gnocchi containers"Maksim Malchuk1-7/+0
This reverts commit 5505cd000ce7f12c272c5b62074c9cc6bf1bb7a7. Reason: Closed #1304 [1] as completed. Branch stable/4.4 is taged 4.4.4 with Fix [2] already. 1. https://github.com/gnocchixyz/gnocchi/issues/1304 2. https://github.com/gnocchixyz/gnocchi/commit/1336d930c18ce16c67d7542bf4c1e99358486a4d Change-Id: I3ca4e10508c26b752412789502ceb917ecb4dbeb Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit 4e5e508282dfd40a7d7831217e109a055073bd7c)
2023-06-20Disable build of Gnocchi containersMaksim Malchuk1-7/+14
Revert this commit when [1] is solved. 1. https://github.com/gnocchixyz/gnocchi/issues/1304 Change-Id: Iafeb9093340621d65a9c9cd126d65679d981dfb1 Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit 5505cd000ce7f12c272c5b62074c9cc6bf1bb7a7)
2023-03-31Fix test malicious tarball failMichal Nasiadka1-1/+1
Since I650fcbc8f773fad8116338f6fb0cf7b4f4f17b33 builds from git fails on plugins with an exception: 'tarfile.ReadError: not a gzip file' because the test checks only gzip compressed archives but plugins created as plain tar files. This change fixes the issue using transparent compression support and also adds some debug info. Closes-Bug: #1990432 Change-Id: If0f9b4dd058a257d0653332d1b663e150c717304 Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> Co-Authored-by: Michal Nasiadka <mnasiadka@gmail.com> (cherry picked from commit 143765fb67221cc51f1dc56a41ac2b67dddc453f)
2023-03-20Test for unsafe files in tarfile.extractallMichal Nasiadka1-1/+10
In addition to that, mark bifrost unbuildable since it's failing on EPEL 9 enablement. Closes-Bug: #1990432 Change-Id: I650fcbc8f773fad8116338f6fb0cf7b4f4f17b33 (cherry picked from commit 3d008b7f5ec2a54d004e8e9370f303ef9dc7858b)
2023-02-21bifrost: mark unbuidable for UbuntuMichal Nasiadka1-0/+1
Ubuntu packages have changed efi shim file name and bifrost is failing. Change-Id: I0d072ae6081a9427aebf4dc562501a0a6ef160d0 (cherry picked from commit b2f747fbba7adf3059d0da9bd899788b4a45763c)
2022-12-07Merge "Drop elasticsearch, kibana and logstash"Zuul1-9/+0
2022-12-06Drop elasticsearch, kibana and logstashMichal Nasiadka1-9/+0
Support has been dropped in kolla-ansible, the upgrade path is opensearch. Change-Id: I6f32aacb4e0b7dd1eb7206e02425b16f5beae4f0
2022-12-06Remove monasca, kafka, storm and zookeeper.Michal Nasiadka1-2/+0
Monasca, kafka, storm and zookeeper have been removed in kolla-ansible [1],[2]. [1]: https://review.opendev.org/c/openstack/kolla-ansible/+/861392 [2]: https://review.opendev.org/c/openstack/kolla-ansible/+/865029 Change-Id: I0958a9353bc4585c4f65a1d316328a0e80b0b8b7
2022-12-01telegraf: mark buildableMichal Nasiadka1-4/+0
Change-Id: Iff646c87a5c8d8d1831fea00ae18457f93cca2e5
2022-11-30Fix plugin builds with sources using type=gitJakub Neumann1-1/+11
A recent change to git [1] introduced a new behaviour to work around a CVE [2] that disallows any git operations in directories not owned by the current user. A fix was introduced for general checkouts, but it was not applied to the plugins archive, resulting in PBR still not working as intended. [1] https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 [2] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24765. Closes-Bug: #1969096 Related-Bug: #1968877 Co-Authored-By: Mark Goddard <mark@stackhpc.com> Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> Signed-off-by: Jakub Neumann <jneumann@cloudferro.com> Change-Id: Ib3a37eebb29d975fc51a117cecdff74baafd8941
2022-11-30base: Rocky Linux 9.1 was releasedMarcin Juszkiewicz1-0/+4
And they use release version in /etc/os-release so we need to adapt. Telegraf also needs to be marked unbuildable because of [1]. [1]: https://github.com/influxdata/telegraf/issues/12303 Change-Id: I1d624bd2f87be93a386147c5d7403a5524e41633
2022-10-27Fix incorrect type conversion for cmd option '--docker-dir'Radoslaw Smigielski1-2/+3
kolla-build cmd '--docker-dir' option specified a default value of an empty list, this was causing a warning on tox genconfig. Change-Id: I204a067d76395ef5ad4d3ce23243f196eab3bdd5 Closes-Bug: #1827146
2022-10-07Drop executable perms from non-executablesRadosław Piliszek1-0/+0
It does not make much sense to have them there. TrivialFix Change-Id: If66d264dc8cc366c9f51bfe36f96dd64d4c68d9e
2022-10-07Merge "do not play with PROJECT_ROOT in build.py"Zuul1-20/+5
2022-10-06do not play with PROJECT_ROOT in build.pyMarcin Juszkiewicz1-20/+5
PROJECT_ROOT mangling is already done in kolla/cmd/build.py (which is called as 'kolla-build' or 'tools/build.py' or directly) so it is not needed here. Now we can sort imports and drop not needed ones. Change-Id: Iac6ea537491e5c00ce6fb4b4e8f07a9124e9fa8b
2022-10-06drop shebang from Python filesMarcin Juszkiewicz1-2/+0
Only kolla/cmd/build.py is an executable script used by user (either as 'kolla-build' or 'tools/build.py' or directly). Change-Id: Ia1ba2699f425749f9d4f2cdba27caeb97bc3d668
2022-10-06Move KollaWorker stuff to separate fileMarcin Juszkiewicz2-733/+765
As part of kolla/image/ refactoring we move KollaWorker related classes into own file. Based on patch by Konstantin Yarovoy <konstantin.yarovoy@tietoevry.com> Change-Id: I55c3f6b34631048b2463b02e6ea611d7e4c1a912
2022-10-06Move build related tasks to separate fileMarcin Juszkiewicz2-376/+398
As part of kolla/image/ refactoring we move build related task classes into own file. Based on patch by Konstantin Yarovoy <konstantin.yarovoy@tietoevry.com> Change-Id: I093620679016b37e1664c9fe4cf7559433e744b7
2022-10-06Move status and log related things to separate fileMarcin Juszkiewicz2-22/+38
As part of kolla/image/ refactoring we move status enums/consts into own file. Based on patch by Konstantin Yarovoy <konstantin.yarovoy@tietoevry.com> Change-Id: I940816c7e487f6d5c7abc4446226e2992cf9e63d
2022-10-06Move info about unbuildable images to separate fileMarcin Juszkiewicz2-56/+68
As part of kolla/image/ refactoring we move information about unbuildable images to own file. Like we did with users and sources in past. Based on patch by Konstantin Yarovoy <konstantin.yarovoy@tietoevry.com> Change-Id: I759ab49a3ef488042984067c1eca93e945805678
2022-10-03proxysql: Use almalinux for centos/rocky9Michal Nasiadka1-2/+0
As per https://github.com/sysown/proxysql/issues/3989 Change-Id: If077d60e9efd29fab80f4f5188a4f54015734a92
2022-09-30influxdb: enable on CentOS/AArch64Marcin Juszkiewicz1-1/+0
Change-Id: I468e68db23c6785bd3bfbe65733fe5bf52295fbb
2022-09-30Add RockyLinux 9 supportMichal Nasiadka1-1/+12
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/859570 Change-Id: I7af51d07b8a939c908aa072294061def57dd67de
2022-09-27grafana: ignore SHA1 gpg key on CentOS Stream 9 (and family)Marcin Juszkiewicz1-1/+0
RHEL 9 refuses to use SHA1 gpg keys. Grafana team still did not handled key upgrade: https://github.com/grafana/grafana/issues/41036 Change-Id: Id963271103ce1397b7a5498d032e8f797edfcc70
2022-09-27Move to CentOS Stream 9Marcin Juszkiewicz1-2/+10
OpenStack 'zed' requires Python 3.8+ so RHEL 8 family has to go. This changeset moves to CentOS Stream 9 while move to RockyLinux 9 is planned as final solution. CI moved to CentOS Stream 9 nodes. Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/839715 Change-Id: I113b9984294cf8663d3fc0c8840320e1d40ea731
2022-09-23Merge "ubuntu: enable monasca for x86-64"Zuul1-2/+1
2022-09-14Python 3.8+ has better shutil.copytree()Marcin Juszkiewicz1-10/+1
doc says: > If dirs_exist_ok is false (the default) and dst already exists, a > FileExistsError is raised. If dirs_exist_ok is true, the copying > operation will continue if it encounters existing directories, and files > within the dst tree will be overwritten by corresponding files from the > src tree. So we do not have to copy dirs/files one by one and tell shutil.copytree() to handle everything. Change-Id: I97d9c8261351b8fd88f088c1463cc508e07792e7
2022-09-13ubuntu: enable monasca for x86-64Marcin Juszkiewicz1-2/+1
There is confluent-kafka wheel on Pypi so we can build those images on x86-64. Change-Id: I16a9656641932114e02f6ffa76399c0c4106a90a
2022-08-22Bump minimum docker-py versionDr. Jens Harbott1-7/+0
With version 6.0.0 of the docker python module, their implementation of versioning has changed, making our check for old versions fail. Since version 3.0.0 is from 2018, we should be safe to assume that as a minimum version though, so we can just get rid of the special handling of older versions. Change-Id: I077b7b5acf2c1f9beb6da06d3555e2ebe30831d1
2022-07-27Move to Ubuntu Jammy (22.04)Michal Nasiadka1-2/+6
mariadb - downloads.mariadb.com doesn't have jammy version, should be there soon - using Ubuntu provided version for now telegraf/collectd - collectd packages missing in Jammy - marked as unbuildable monasca - requires new librdkafka, no wheel for Python 3.10 for now Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/846070 Change-Id: I11b4fbcaba165824252902d0270ce1dbbc3d6e9d
2022-07-01Merge "Change kolla_version LABEL to git sha-1"Zuul1-1/+2
2022-06-21Change kolla_version LABEL to git sha-1Michal Arbet1-1/+2
Downstream users are often building their own custom images from their own forked git. Reasoning can be various - added fixes not merged yet, some customizations and etc. Because of this, it's very usefull to have information about git commit in images, and this is exactly what that patch does. If images are built from pip source, kolla_version LABEL contains kolla version. Change-Id: If81989603185528dae86df52e8f8d0f94cdca85d
2022-06-20disable monasca for AArch64 on all distrosMarcin Juszkiewicz1-4/+2
INFO:kolla.common.utils.monasca-base: Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html" No more monasca for aarch64. Change-Id: Ice6f1ab4a08d0ef07ce2434bfef704b68e90f9d0
2022-06-20Fix error message when git clone failsMark Goddard1-1/+2
1. There was no %s for the image.name 2. The image name is in the logger, so the source is more useful (which may be a plugin or addition) TrivialFix Change-Id: If95a8a41d2caf6738d4ccb9ddb651a06018743f4
2022-06-02Allow to provide own repos.yaml fileMarcin Juszkiewicz1-0/+2
Several people use Kolla behind firewall/proxy. Internal mirrors are often in use then. We do not provide a way to replace repos.yaml file in an easy way which may lead to complicated solutions or template overrides. This patch adds a way to provide own copy of repos.yaml file. Change-Id: I0b07da22fea27e0ff4e90aaad19e50d84ff9a121
2022-05-29Use the new image naming scheme by defaultRadosław Piliszek1-4/+1
Adds a relevant reno to inform users about the change and the possibility to customise the prefix. Additionally, this patch includes the fix to Ubuntu image builds regarding rabbitmq and erlang. Both the changes are required to fix master CI. Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/843752
2022-05-18Fix local sources of git repositoriesRadosław Piliszek1-10/+11
This is I2cbf1f539880d512aa223c3ef3a4b19ee18854ac extended to fix the case when a git repository is used with a git repo. This is probably a rarer use case but, still, we use it in CI for in-review changes testing. Change-Id: I77b0dcd2e9dfd8ea8390a471b80c8954b67ef91b
2022-05-18[bifrost] Force Bifrost to use the correct git branchRadosław Piliszek1-0/+5
Bifrost decides on the branches to use by itself. Early in the cycle, they are often not set correctly and may break our CI. This patch ensures we force Bifrost to use the expected branches, making us independent of Bifrost getting fixed. Change-Id: I33dbca927062284fd7a06ab6db732dd5e2219c40
2022-05-02[publishing] use a new naming schemeRadosław Piliszek1-1/+4
This change switches published images names from the current format <base_distro>-<image_name>:<openstack_release>-<arch_suffix> to a preciser and image-oriented (for better variant listing) format <image_name>:<openstack_release>-<base_distro>-<base_distro_version>-<arch_suffix> Change-Id: I6a4b5c2087b94f96f72aa9d0d0781ff14d3ee6bb
2022-04-21switch to short image names by defaultMarcin Juszkiewicz1-4/+1
We can drop temporary 'use-short-names' argument and make short (kolla/debian-nova-libvirt:master) image names default. Kolla Ansible is using short names now. Change-Id: I153355353cd12aa25adaa9c87438a478748dfb28
2022-04-19add a way to not have 'install_type' in image name (temporary)Marcin Juszkiewicz1-2/+4
--use-short-names argument drops 'install_type' from image names: kolla/debian-openstack-base:14.1.0 This should allow to get rid of '-source' in image names without disrupting CI jobs. Switch publish jobs to use short names so k-a tests will have ready to use images for both long and short names. Change-Id: I29c9d51f4b518a4e2d3157ab5d6cc434fb83f2ef
2022-04-14drop install_type almost everywhereMarcin Juszkiewicz1-65/+60
The only place where it stays is argument parsing where it gets ignored. Hardcoded to 'source' to make merging both kolla and kolla-ansible changes easier. Change-Id: I6890a7ec7baf507f8acd75b42bbd0fb17c2e4511 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/837620
2022-04-14Fix image builds with sources using a type=gitMarcin Juszkiewicz1-1/+11
A recent change to git [1] introduced a new behaviour to work around a CVE [2] that disallows any git operations in directories not owned by the current user. This may seem unrelated to installation, but it plays havoc with PBR, which calls out to git to get to get revision history. So if you are "pip install"-ing from a source tree you don't own, the PBR git calls in that tree now fail and the install blows up. When using type=source, kolla clones the repository, then creates a tarball from it, which is ADDed to the image. The ownership of the files in the tarball is preserved, which in this case will be the user running kolla-build. Since the Docker build runs as root, we hit the PBR issue. Our solution is to make sure that any tarball we generate from git sources have all files owned by root:root so that the root user is able to use git commands when building container images. [1] https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 [2] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24765. Closes-Bug: #1969096 Related-Bug: #1968877 Co-Authored-By: Mark Goddard <mark@stackhpc.com> Change-Id: I2cbf1f539880d512aa223c3ef3a4b19ee18854ac
2022-04-12Merge "drop list of images unbuildable for source type"Zuul1-3/+0
2022-04-11Remove duplicate entry in UNBUILDABLE_IMAGESRadosław Piliszek1-1/+0
hacluster-pcs is already in centos, no need to be in centos+aarch64. TrivialFix Change-Id: I9868f73172efedf113c3cc1567098b3439e2a205
2022-04-11Merge "for Zed cycle minimal Python version is 3.8"Zuul1-1/+1