diff mbox series

[XEN,v2,6/6] CI: Don't use -y with apt-get update

Message ID 67fbec9dd324802e1a1c5e3c38ae7853ede35e86.1730743077.git.javi.merino@cloud.com (mailing list archive)
State New
Headers show
Series automation: Refresh the remaining Debian containers | expand

Commit Message

Javi Merino Nov. 6, 2024, 1:05 p.m. UTC
apt-get update refreshes the package lists.  -y doesn't do anything
here.  It is needed for "apt-get install" or "apt-get upgrade" but not
for apt-get update.  Drop it.

Signed-off-by: Javi Merino <javi.merino@cloud.com>
---
 automation/build/debian/11-ppc64le.dockerfile        | 2 +-
 automation/build/debian/11-riscv64.dockerfile        | 2 +-
 automation/build/debian/12-ppc64le.dockerfile        | 2 +-
 automation/build/debian/12-riscv64.dockerfile        | 2 +-
 automation/build/debian/12-x86_64-gcc-ibt.dockerfile | 4 ++--
 automation/build/ubuntu/16.04-x86_64.dockerfile      | 2 +-
 automation/build/ubuntu/18.04-x86_64.dockerfile      | 2 +-
 automation/build/ubuntu/20.04-x86_64.dockerfile      | 2 +-
 automation/build/ubuntu/22.04-x86_64.dockerfile      | 2 +-
 automation/build/ubuntu/24.04-x86_64.dockerfile      | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

Comments

Andrew Cooper Nov. 6, 2024, 3:56 p.m. UTC | #1
On 06/11/2024 1:05 pm, Javi Merino wrote:
> apt-get update refreshes the package lists.  -y doesn't do anything
> here.  It is needed for "apt-get install" or "apt-get upgrade" but not
> for apt-get update.  Drop it.
>
> Signed-off-by: Javi Merino <javi.merino@cloud.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

> ---
>  automation/build/debian/11-ppc64le.dockerfile        | 2 +-
>  automation/build/debian/11-riscv64.dockerfile        | 2 +-
>  automation/build/debian/12-ppc64le.dockerfile        | 2 +-
>  automation/build/debian/12-riscv64.dockerfile        | 2 +-
>  automation/build/debian/12-x86_64-gcc-ibt.dockerfile | 4 ++--
>  automation/build/ubuntu/16.04-x86_64.dockerfile      | 2 +-
>  automation/build/ubuntu/18.04-x86_64.dockerfile      | 2 +-
>  automation/build/ubuntu/20.04-x86_64.dockerfile      | 2 +-
>  automation/build/ubuntu/22.04-x86_64.dockerfile      | 2 +-
>  automation/build/ubuntu/24.04-x86_64.dockerfile      | 2 +-

Judging by this file list, the change is independent of patches 1-5, so
can go in straight away.

~Andrew
diff mbox series

Patch

diff --git a/automation/build/debian/11-ppc64le.dockerfile b/automation/build/debian/11-ppc64le.dockerfile
index d846b670d02c..385a0a071db2 100644
--- a/automation/build/debian/11-ppc64le.dockerfile
+++ b/automation/build/debian/11-ppc64le.dockerfile
@@ -13,7 +13,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/debian/11-riscv64.dockerfile b/automation/build/debian/11-riscv64.dockerfile
index 1c99bc89ea1a..a55047c5019a 100644
--- a/automation/build/debian/11-riscv64.dockerfile
+++ b/automation/build/debian/11-riscv64.dockerfile
@@ -13,7 +13,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/debian/12-ppc64le.dockerfile b/automation/build/debian/12-ppc64le.dockerfile
index 1d5b486bb47f..da518aab4e10 100644
--- a/automation/build/debian/12-ppc64le.dockerfile
+++ b/automation/build/debian/12-ppc64le.dockerfile
@@ -13,7 +13,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/debian/12-riscv64.dockerfile b/automation/build/debian/12-riscv64.dockerfile
index 8d7233d6757d..bce8f1015f7c 100644
--- a/automation/build/debian/12-riscv64.dockerfile
+++ b/automation/build/debian/12-riscv64.dockerfile
@@ -13,7 +13,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/debian/12-x86_64-gcc-ibt.dockerfile b/automation/build/debian/12-x86_64-gcc-ibt.dockerfile
index 3ce60e7d9466..9b5d11fca648 100644
--- a/automation/build/debian/12-x86_64-gcc-ibt.dockerfile
+++ b/automation/build/debian/12-x86_64-gcc-ibt.dockerfile
@@ -6,7 +6,7 @@  ENV DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 #!/bin/bash
     set -e
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         bison
@@ -62,7 +62,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/ubuntu/16.04-x86_64.dockerfile b/automation/build/ubuntu/16.04-x86_64.dockerfile
index d8617bfade5e..9cc8ca89e8e0 100644
--- a/automation/build/ubuntu/16.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/16.04-x86_64.dockerfile
@@ -11,7 +11,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/ubuntu/18.04-x86_64.dockerfile b/automation/build/ubuntu/18.04-x86_64.dockerfile
index 336697ad954b..aefe52125a22 100644
--- a/automation/build/ubuntu/18.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/18.04-x86_64.dockerfile
@@ -11,7 +11,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/ubuntu/20.04-x86_64.dockerfile b/automation/build/ubuntu/20.04-x86_64.dockerfile
index 39fb297519ee..1ee20a13ac6b 100644
--- a/automation/build/ubuntu/20.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/20.04-x86_64.dockerfile
@@ -11,7 +11,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/ubuntu/22.04-x86_64.dockerfile b/automation/build/ubuntu/22.04-x86_64.dockerfile
index 6aa3c4d1881d..a9a9b84930fb 100644
--- a/automation/build/ubuntu/22.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/22.04-x86_64.dockerfile
@@ -11,7 +11,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen
diff --git a/automation/build/ubuntu/24.04-x86_64.dockerfile b/automation/build/ubuntu/24.04-x86_64.dockerfile
index c46d152abf10..2005723b31ad 100644
--- a/automation/build/ubuntu/24.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/24.04-x86_64.dockerfile
@@ -11,7 +11,7 @@  RUN <<EOF
 
     useradd --create-home user
 
-    apt-get -y update
+    apt-get update
 
     DEPS=(
         # Xen