From 418a7bcb6e21d64cc54e4ddda16a377a483d7e0b Mon Sep 17 00:00:00 2001 From: Luan Nunes Utimura Date: Mon, 25 Sep 2023 15:34:50 -0300 Subject: [PATCH] stx-openstackclients: Add openstack in DIST_REPOS After introducing a new set of layer-specific `sources.list` files in [1], we can now update the `DIST_REPOS` of this image to additionally use the `openstack` layer binary repository when searching for dependencies of packages listed in `DIST_PACKAGES`. This ensures that OpenStack Antelope packages will be built *without* OpenStack Victoria dependencies. [1] https://review.opendev.org/c/starlingx/root/+/896277 Test Plan: PASS - Build `stx-debian` base image PASS - Build `stx-openstackclients` container image and confirm that OpenStack Antelope dependencies were used in the build of `python3-cinderclient` and `python3-openstackclient` Depends-On: https://review.opendev.org/c/starlingx/root/+/896277 Closes-Bug: 2037339 Change-Id: If94d5281c5c2633b59a6aaf39f0881fb5cec61bb Signed-off-by: Luan Nunes Utimura --- .../debian/stx-openstackclient.stable_docker_image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upstream/openstack/python-openstackclient/debian/stx-openstackclient.stable_docker_image b/upstream/openstack/python-openstackclient/debian/stx-openstackclient.stable_docker_image index 287f8aef..8dadb39c 100644 --- a/upstream/openstack/python-openstackclient/debian/stx-openstackclient.stable_docker_image +++ b/upstream/openstack/python-openstackclient/debian/stx-openstackclient.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-openstackclients PROJECT=infra PROJECT_REPO=nil -DIST_REPOS="OS" +DIST_REPOS="OS +openstack" PIP_PACKAGES=" aodhclient \ httplib2 \