From bce06d2d5a27fd2e430de0078b7d585cfc98d8a4 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Fri, 3 Jun 2022 17:01:25 +0300 Subject: Don't ignore errors of 'apt-get update' command This change fixes an issue with 'apt-get update' command and stop container building with erroneous source repositories. Change-Id: I5ce2eb66a647e1805f086aa37942bf5d13eb4106 Signed-off-by: Maksim Malchuk --- kolla/template/methods.py | 2 +- releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 94d72401b..57a5e8330 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -49,7 +49,7 @@ def debian_package_install(packages, clean_package_cache=True): # handle the apt-get install if reg_packages: - cmds.append('apt-get update') + cmds.append('apt-get --error-on=any update') cmds.append('apt-get -y install --no-install-recommends {}'.format( ' '.join(reg_packages) )) diff --git a/releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml b/releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml new file mode 100644 index 000000000..395c8936b --- /dev/null +++ b/releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + The ``apt-get update`` command by default didn't fail on erroneous source + repositories, it show the warning 'W: Some index files failed to download. + They have been ignored, or old ones used instead.' and continue to work. + This causes some containers (eg. rabbitmq, kolla-toolbox) successfully + built, but makes them inconsistent because the official Ubuntu repository + contains packages with the same names. Now we use ``apt-get -eany update`` + command to stop building with an error in such cases. -- cgit v1.2.3