starlingx
/
tools
Code Issues Proposed changes

tools: Upgrade to bookworm distrobution 

1.Use Debian bookworm dockerfile;
2.Use the DEBIAN_DISTROBUTION environment variable instead;
3.Align the package version in the binary package lists with bookworm;
4.Update the resource repo url.

TestPlan:
PASS: ./stx-init-env --rebuild --cache
PASS: stx shell

Story: 2011048
Task: 49683

Change-Id: I78367521365c3143f56cde8eae129b7e9890a659
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
This commit is contained in:
Zhixiong Chi 2024-02-25 18:23:50 -08:00
parent 7c9d8e4907
commit 736a33e952
12 changed files with 1299 additions and 1390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1202
debian-mirror-tools/config/debian/common/base-bookworm.lst Normal file
View File

File diff suppressed because it is too large Load Diff

1286
debian-mirror-tools/config/debian/common/base-bullseye.lst
View File

File diff suppressed because it is too large Load Diff

106
debian-mirror-tools/config/debian/containers/os-std.lst
View File

@ -1,60 +1,50 @@
acpica-tools 20200925-1.2
autoconf-archive 20190106-2.1
autogen 1:5.18.16-4
autogen-doc 1:5.18.16-4
cmake 3.18.4-2+deb11u1
cmake-data 3.18.4-2+deb11u1
docutils-doc 0.16+dfsg-4
doxygen 1.9.1-1
dwarves 1.20-1
acpica-tools 20200925-8
autoconf-archive 20220903-3
autogen 1:5.18.16-5
autogen-doc 1:5.18.16-5
cmake 3.25.1-1
cmake-data 3.25.1-1
docutils-doc 0.19+dfsg-6
doxygen 1.9.4-4
dwarves 1.24-4.1
fonts-mathjax 2.7.9+dfsg-1
g++-10 10.2.1-6
git 1:2.30.2-1 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/g/git/git_2.30.2-1_amd64.deb
git-man 1:2.30.2-1 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/g/git/git-man_2.30.2-1_all.deb
git-review 1.28.0-2
guile-2.2-libs 2.2.7+1-6
hwdata 0.345-1
libcap-dev 1:2.44-1
libclang-cpp11 1:11.0.1-2
libclang1-11 1:11.0.1-2
liberror-perl 0.17029-1
libhwloc-dev 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc-dev_1.11.12-3_amd64.deb
libhwloc5 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc5_1.11.12-3_amd64.deb
g++-12 12.2.0-14
git 1:2.39.2-1.1
git-man 1:2.39.2-1.1
git-review 2.3.1-1
guile-2.2-libs 2.2.7+1-9
hwdata 0.368-1
libcap-dev 1:2.66-4
libclang-cpp16 1:16.0.6-15~deb12u1
libclang1-16 1:16.0.6-15~deb12u1
liberror-perl 0.17029-2
libhwloc-dev 2.9.0-1
libhwloc15 2.9.0-1
libjs-mathjax 2.7.9+dfsg-1
libjson-c-dev 0.15-2
libjsoncpp24 1.9.4-4
libltdl-dev 2.4.6-15
libncurses-dev 6.2+20201114-2 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/n/ncurses/libncurses-dev_6.2%2B20201114-2_amd64.deb
libnuma-dev 2.0.12-1+b1
libopts25-dev 1:5.18.16-4
libpython2-stdlib 2.7.18-3
libpython2.7 2.7.18-8+deb11u1 https://snapshot.debian.org/archive/debian/20230926T090746Z/pool/main/p/python2.7/libpython2.7_2.7.18-8%2Bdeb11u1_amd64.deb
libpython2.7-minimal 2.7.18-8+deb11u1 https://snapshot.debian.org/archive/debian/20230926T090746Z/pool/main/p/python2.7/libpython2.7-minimal_2.7.18-8%2Bdeb11u1_amd64.deb
libpython2.7-stdlib 2.7.18-8+deb11u1 https://snapshot.debian.org/archive/debian/20230926T090746Z/pool/main/p/python2.7/libpython2.7-stdlib_2.7.18-8%2Bdeb11u1_amd64.deb
libpython2.7-dev 2.7.18-8+deb11u1 https://snapshot.debian.org/archive/debian/20230926T090746Z/pool/main/p/python2.7/libpython2.7-dev_2.7.18-8%2Bdeb11u1_amd64.deb
librhash0 1.4.1-2
libsimdjson5 0.7.1-1
libstdc++-10-dev 10.2.1-6
libxapian30 1.4.18-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/x/xapian-core/libxapian30_1.4.18-3_amd64.deb
pandoc 2.9.2.1-1+deb11u1 https://snapshot.debian.org/archive/debian/20230925T090110Z/pool/main/p/pandoc/pandoc_2.9.2.1-1%2Bdeb11u1_amd64.deb
pandoc-data 2.9.2.1-1+deb11u1 https://snapshot.debian.org/archive/debian/20230925T090110Z/pool/main/p/pandoc/pandoc-data_2.9.2.1-1%2Bdeb11u1_all.deb
pkg-config 0.29.2-1
pybind11-dev 2.6.2-1
python3-oslo.messaging 12.5.2-1 https://snapshot.debian.org/archive/debian/20210331T144200Z/pool/main/p/python-oslo.messaging/python3-oslo.messaging_12.5.2-1_all.deb
python3-prometheus-client 0.7.1-1.1 https://snapshot.debian.org/archive/debian/20191124T025632Z/pool/main/p/python-prometheus-client/python3-prometheus-client_0.7.1-1.1_all.deb
python-requests-doc 2.25.1+dfsg-2
python2 2.7.18-3
python2-minimal 2.7.18-3
python2.7 2.7.18-8+deb11u1 https://snapshot.debian.org/archive/debian/20230926T090746Z/pool/main/p/python2.7/python2.7_2.7.18-8%2Bdeb11u1_amd64.deb
python2.7-minimal 2.7.18-8+deb11u1 https://snapshot.debian.org/archive/debian/20230926T090746Z/pool/main/p/python2.7/python2.7-minimal_2.7.18-8%2Bdeb11u1_amd64.deb
python2.7-dev 2.7.18-8+deb11u1 https://snapshot.debian.org/archive/debian/20230926T090746Z/pool/main/p/python2.7/python2.7-dev_2.7.18-8%2Bdeb11u1_amd64.deb
python3-doc 3.9.2-3
python3-intelhex 2.1-2.2
python3-pybind11 2.6.2-1
python3-thriftpy 0.3.9+ds1-1+b5
python3.9-doc 3.9.2-1
sphinx-doc 3.4.3-2
trace-cmd 2.9.1-1
tree 1.8.0-1+b1
unzip 6.0-26+deb11u1
usb.ids 2022.05.20-0+deb11u1 https://snapshot.debian.org/archive/debian/20220702T033910Z/pool/main/u/usb.ids/usb.ids_2022.05.20-0+deb11u1_all.deb
libjson-c-dev 0.16-2
libjsoncpp25 1.9.5-4
libltdl-dev 2.4.7-5
libncurses-dev 6.4-4
libnuma-dev 2.0.16-1
libopts25-dev 1:5.18.16-5
librhash0 1.4.3-3
libsimdjson14 3.0.1-1
libstdc++-12-dev 12.2.0-14
libxapian30 1.4.22-1
pandoc 2.17.1.1-2~deb12u1
pandoc-data 2.17.1.1-2~deb12u1
pkg-config 1.8.1-1
pybind11-dev 2.10.3-1
python3-oslo.messaging 14.0.0-2
python3-prometheus-client 0.16.0-0.1
python-requests-doc 2.28.1+dfsg-1
python3-doc 3.11.2-1
python3-intelhex 2.3.0-2
python3-pybind11 2.10.3-1
python3-thriftpy 0.3.9+ds1-2+b3
python3.11-doc 3.11.2-6
sphinx-doc 5.3.0-4
trace-cmd 3.1.6-1
tree 2.1.0-1
unzip 6.0-28
usb.ids 2024.01.20-0+deb12u1

8
debian-mirror-tools/config/debian/distro/os-std.lst
View File

@ -1,9 +1,9 @@
#The OS binary packages that depended by StarlingX patched packages,
#but they are not in the base packages list
# This installs kdump and its dependency on Debian
makedumpfile 1:1.6.8-4
kexec-tools 1:2.0.20-2.1
crash 7.2.9-2
makedumpfile 1:1.7.2-1
kexec-tools 1:2.0.25-3+b1
crash 8.0.2-1
liblzo2-2 2.10-2
pigz 2.6-1
yajl-tools 2.1.0-3+deb11u2 https://snapshot.debian.org/archive/debian/20230725T030258Z/pool/main/y/yajl/yajl-tools_2.1.0-3%2Bdeb11u2_amd64.deb
yajl-tools 2.1.0-3+deb12u2

4
debian-mirror-tools/config/debian/flock/os-std.lst
View File

@ -1,2 +1,2 @@
libhwloc-dev 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc-dev_1.11.12-3_amd64.deb
libhwloc5 1.11.12-3 https://snapshot.debian.org/archive/debian/20220703T032011Z/pool/main/h/hwloc/libhwloc5_1.11.12-3_amd64.deb
libhwloc-dev 2.9.0-1
libhwloc15 2.9.0-1

52
debian-mirror-tools/config/debian/openstack/os-std.lst
View File

@ -1,26 +1,26 @@
python3-keystoneauth1 5.1.2-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-keystoneauth1/python3-keystoneauth1_5.1.2-2_all.deb
python3-keystonemiddleware 10.2.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-keystonemiddleware/python3-keystonemiddleware_10.2.0-2_all.deb
python3-mock 4.0.3-1 https://snapshot.debian.org/archive/debian/20210102T202954Z/pool/main/p/python-mock/python3-mock_4.0.3-1_all.deb
python3-osc-lib 2.7.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-osc-lib/python3-osc-lib_2.7.0-2_all.deb
python3-osc-placement 4.1.0-3 https://snapshot.debian.org/archive/debian/20230821T205629Z/pool/main/p/python-osc-placement/python3-osc-placement_4.1.0-3_all.deb
python3-pyro4 4.80-1 https://snapshot.debian.org/archive/debian/20200614T024052Z/pool/main/p/pyro4/python3-pyro4_4.80-1_all.deb
python3-oslo.cache 3.3.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.cache/python3-oslo.cache_3.3.1-2_all.deb
python3-oslo.concurrency 5.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.concurrency/python3-oslo.concurrency_5.1.1-2_all.deb
python3-oslo.config 1:9.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.config/python3-oslo.config_9.1.1-2_all.deb
python3-oslo.context 5.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.context/python3-oslo.context_5.1.1-2_all.deb
python3-oslo.db 12.3.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.db/python3-oslo.db_12.3.1-2_all.deb
python3-oslo.i18n 6.0.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.i18n/python3-oslo.i18n_6.0.0-2_all.deb
python3-oslo.log 5.2.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.log/python3-oslo.log_5.2.0-2_all.deb
python3-oslo.messaging 14.2.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.messaging/python3-oslo.messaging_14.2.0-2_all.deb
python3-oslo.metrics 0.6.0-3 https://snapshot.debian.org/archive/debian/20230815T213225Z/pool/main/p/python-oslo.metrics/python3-oslo.metrics_0.6.0-3_all.deb
python3-oslo.middleware 5.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.middleware/python3-oslo.middleware_5.1.1-2_all.deb
python3-oslo.policy 4.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.policy/python3-oslo.policy_4.1.1-2_all.deb
python3-oslo.serialization 5.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.serialization/python3-oslo.serialization_5.1.1-2_all.deb
python3-oslo.service 3.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.service/python3-oslo.service_3.1.1-2_all.deb
python3-oslo.upgradecheck 2.1.1-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.upgradecheck/python3-oslo.upgradecheck_2.1.1-2_all.deb
python3-oslo.utils 6.1.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.utils/python3-oslo.utils_6.1.0-2_all.deb
python3-oslo.versionedobjects 3.1.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-oslo.versionedobjects/python3-oslo.versionedobjects_3.1.0-2_all.deb
python3-serpent 1.30.2-1 https://snapshot.debian.org/archive/debian/20200212T030619Z/pool/main/s/serpent/python3-serpent_1.30.2-1_all.deb
python3-sqlalchemy 1.4.47+ds1-1 https://snapshot.debian.org/archive/debian-ports/20230401T234825Z/pool/main/s/sqlalchemy/python3-sqlalchemy_1.4.47%2Bds1-1_all.deb
python3-stevedore 5.0.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/s/stevedore/python3-stevedore_5.0.0-2_all.deb
python3-swiftclient 1:4.2.0-2 https://snapshot.debian.org/archive/debian-ports/20230623T210953Z/pool/main/p/python-swiftclient/python3-swiftclient_4.2.0-2_all.deb
python3-keystoneauth1 5.0.0-2
python3-keystonemiddleware 10.1.0-4
python3-mock 4.0.3-4
python3-osc-lib 2.6.2-2
python3-osc-placement 4.0.0-2
python3-pyro4 4.82-2
python3-oslo.cache 3.2.0-1
python3-oslo.concurrency 5.0.1-3
python3-oslo.config 1:9.0.0-3
python3-oslo.context 5.0.0-2
python3-oslo.db 12.1.0-3
python3-oslo.i18n 5.1.0-3
python3-oslo.log 5.0.1-1
python3-oslo.messaging 14.0.0-2
python3-oslo.metrics 0.5.0-2
python3-oslo.middleware 5.0.0-2
python3-oslo.policy 4.0.0-2
python3-oslo.serialization 5.0.0-2
python3-oslo.service 3.0.0-2
python3-oslo.upgradecheck 2.0.0-2
python3-oslo.utils 6.0.1-2
python3-oslo.versionedobjects 3.0.1-2
python3-serpent 1.41-1
python3-sqlalchemy 1.4.46+ds1-1
python3-stevedore 4.0.2-2
python3-swiftclient 1:4.1.0-2

8
stx.conf.sample
View File

@ -8,8 +8,8 @@ proxyport = 8080
buildbranch = master
manifest = default.xml
ostree_osname = debian
debian_distribution = bullseye
debian_version = 11.3
debian_distribution = bookworm
debian_version = 12.5
# These URLs must contain snapshots of debian & debian-security repos.
# We will append debian_snapshot_timestamp to each of them when creating
@ -23,8 +23,8 @@ debian_snapshot_timestamp = 20220331T000000Z
[builder]
uid = 1000
myuname = builder
release = 6.0
dist = bullseye
release = 9.0
dist = bookworm
stx_dist = .stx
debfullname = STX Builder
debemail = stx.builder@opendev.org

8
stx/dockerfiles/stx-builder.Dockerfile
View File

@ -12,14 +12,13 @@
#
# Copyright (C) 2021-2022 Wind River Systems,Inc.
#
FROM debian:bullseye
FROM debian:bookworm
ENV container=docker \
PATH=/opt/LAT/lat:$PATH
RUN echo "deb-src http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list && \
echo "deb-src http://deb.debian.org/debian buster main" >> /etc/apt/sources.list && \
echo "deb http://deb.debian.org/debian bullseye contrib" >> /etc/apt/sources.list
RUN echo "deb-src http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list && \
echo "deb http://deb.debian.org/debian bookworm contrib" >> /etc/apt/sources.list
# Update certificates
RUN apt-get -y update && apt-get -y install --no-install-recommends ca-certificates && update-ca-certificates
@ -70,6 +69,7 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /
apt-get install --no-install-recommends -y docker-ce-cli
# Python modules
RUN mv /usr/lib/python3.11/EXTERNALLY-MANAGED /usr/lib/python3.11/EXTERNALLY-MANAGED.bk
RUN pip3 --no-cache-dir install \
gitpython \
requests \

3
stx/dockerfiles/stx-lat-tool.Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:bullseye
FROM debian:bookworm
MAINTAINER Chen Qi <Qi.Chen@windriver.com>
@ -40,6 +40,7 @@ RUN apt-get -y update && apt-get --no-install-recommends -y install \
&& \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
mv /usr/lib/python3.11/EXTERNALLY-MANAGED /usr/lib/python3.11/EXTERNALLY-MANAGED.bk && \
mkdir -p /opt/LAT/SDK && \
pip3 install pycryptodomex requests_toolbelt

5
stx/dockerfiles/stx-pkgbuilder.Dockerfile
View File

@ -12,9 +12,9 @@
#
# Copyright (C) 2021-2022 Wind River Systems,Inc.
#
FROM debian:bullseye
FROM debian:bookworm
RUN echo "deb-src http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list
RUN echo "deb-src http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list
ARG DEBIAN_FRONTEND=noninteractive
# Update certificates
@ -44,6 +44,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
procps && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
mv /usr/lib/python3.11/EXTERNALLY-MANAGED /usr/lib/python3.11/EXTERNALLY-MANAGED.bk && \
pip3 install Flask && \
sudo sbuild-adduser root

2
stx/toCOPY/pkgbuilder/app.py
View File

@ -19,7 +19,7 @@ from flask import jsonify
from flask import request
import logging
STX_DISTRO = 'bullseye'
STX_DISTRO = 'bookworm'
STX_ARCH = 'amd64'
PKG_BUILDER_LOG = '/localdisk/pkgbuilder.log'

5
stx/toCOPY/pkgbuilder/debbuilder.conf
View File

@ -36,8 +36,9 @@ $external_commands = {
'cp /etc/apt/sources.list tmp.list',
'cat tmp.list',
'sed -i "1 i\deb [trusted=yes] http://stx-stx-repomgr:80/deb-local-binary @DEBIAN_DISTRIBUTION@ main" tmp.list',
'echo "deb @STX_MIRROR_URL@/debian/debian/deb.debian.org/debian/@DEBIAN_DISTRIBUTION@-@DEBIAN_VERSION@ @DEBIAN_DISTRIBUTION@ main" >> tmp.list',
'echo "deb-src @STX_MIRROR_URL@/debian/debian/deb.debian.org/debian/@DEBIAN_DISTRIBUTION@-@DEBIAN_VERSION@ @DEBIAN_DISTRIBUTION@ main" >> tmp.list',
'echo "deb @STX_MIRROR_URL@/debian/debian/ftp.ca.debian.org/debian/@DEBIAN_DISTRIBUTION@-@DEBIAN_VERSION@ @DEBIAN_DISTRIBUTION@ main" >> tmp.list',
'echo "deb-src @STX_MIRROR_URL@/debian/debian/ftp.ca.debian.org/debian/@DEBIAN_DISTRIBUTION@-@DEBIAN_VERSION@ @DEBIAN_DISTRIBUTION@ main" >> tmp.list',
'echo "deb @STX_MIRROR_URL@/debian/debian/ftp.ca.debian.org/debian/@DEBIAN_DISTRIBUTION@-updates-12 @DEBIAN_DISTRIBUTION@-updates main" >> tmp.list',
'awk \'!a[$0]++\' tmp.list > new.list && mv -f new.list /etc/apt/sources.list',
'cat /etc/apt/sources.list',
'echo "Package: *" > /etc/apt/preferences.d/local_repos',