[PATCH 0/3] Gitlab: update images used for CI

[PATCH 0/3] Gitlab: update images used for CI

[Uladzimir Bely]

Switch to latest stable bookworm-based images for Gitlab CI.

This includes both `kas-isar` and `docker-isar` updates.

Uladzimir Bely (3):
  docker-isar: Dockerfile: update avocado version to 103.0
  docker-isar: Preinstall python3-apt package
  gitlab-ci.yml: Use the latest stable kas-isar-4.4 based images.

 .gitlab-ci.yml                  | 4 ++--
 testsuite/dockerdata/Dockerfile | 3 ++-
 testsuite/dockerdata/README.md  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.44.2

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240819161842.10367-1-ubely%40ilbers.de.

[PATCH 1/3] docker-isar: Dockerfile: update avocado version to 103.0

[Uladzimir Bely]

Using "--break-system-packages" allows system-wide installation of
the package by pip, so we don't spend time to download/install it
in python venv when ci_build.sh called.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 testsuite/dockerdata/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/dockerdata/Dockerfile b/testsuite/dockerdata/Dockerfile
index db07e7fc..306ec950 100644
--- a/testsuite/dockerdata/Dockerfile
+++ b/testsuite/dockerdata/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETPLATFORM
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Isar testsuite dependencies
-RUN sudo pip3 --proxy=$https_proxy install avocado-framework==100.1 && \
+RUN sudo pip3 --proxy=$https_proxy install --break-system-packages avocado-framework==103.0 && \
     sudo apt-get update && \
     sudo apt-get install -y -f --no-install-recommends qemu-system ovmf && \
     sudo apt-get clean && \
-- 
2.44.2

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240819161842.10367-2-ubely%40ilbers.de.

[PATCH 2/3] docker-isar: Preinstall python3-apt package

[Uladzimir Bely]

Python-apt is used by upcoming base-apt patchset. Preinstalling it
in the image saves time on every ci_build.sh call.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 testsuite/dockerdata/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testsuite/dockerdata/Dockerfile b/testsuite/dockerdata/Dockerfile
index 306ec950..2a77798a 100644
--- a/testsuite/dockerdata/Dockerfile
+++ b/testsuite/dockerdata/Dockerfile
@@ -7,5 +7,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN sudo pip3 --proxy=$https_proxy install --break-system-packages avocado-framework==103.0 && \
     sudo apt-get update && \
     sudo apt-get install -y -f --no-install-recommends qemu-system ovmf && \
+    sudo apt-get install -y -f --no-install-recommends python3-apt && \
     sudo apt-get clean && \
     sudo rm -rf $(pip3 cache dir) /var/lib/apt/lists/* /tmp/* /var/tmp/*
-- 
2.44.2

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240819161842.10367-3-ubely%40ilbers.de.

[PATCH 3/3] gitlab-ci.yml: Use the latest stable kas-isar-4.4 based images.

[Uladzimir Bely]

Since commit 56767797, full CI in Gitlab started failing due to
using bullseye-based (kas-isar-3.2.3) images.

Skopeo version in bullseye doesn't support "--preserve-digests" option
the mentioned patch uses.

Update the images to bookworm-based kas-isar-4.4 and docker-isar-4.4.

Also, update related documentation to fit the changes.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 .gitlab-ci.yml                 | 4 ++--
 testsuite/dockerdata/README.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebc1e5a4..b5faa11a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 default:
-  image: ghcr.io/siemens/kas/kas-isar:3.2.3
+  image: ghcr.io/siemens/kas/kas-isar:4.4
 
 variables:
   GIT_STRATEGY: clone
@@ -26,7 +26,7 @@ variables:
 
 
 .docker-isar: &docker-isar
-  image: ghcr.io/ilbers/docker-isar:3.2.3
+  image: ghcr.io/ilbers/docker-isar:4.4
 
 
 .use-default-image:
diff --git a/testsuite/dockerdata/README.md b/testsuite/dockerdata/README.md
index 930d7788..e6b76d25 100644
--- a/testsuite/dockerdata/README.md
+++ b/testsuite/dockerdata/README.md
@@ -1,7 +1,7 @@
 # Creating image
 
 ```
-export version="3.2.3"
+export version="4.4"
 cd <isar_dir>/testsuite/dockerdata
 sed "s/:<version>/:${version}/" Dockerfile | docker build -t ghcr.io/ilbers/docker-isar:${version} -
 ```
@@ -13,7 +13,7 @@ sed "s/:<version>/:${version}/" Dockerfile | docker build -t ghcr.io/ilbers/dock
 - Use it for uploading docker image:
 
 ```
-export version="3.2.3"
+export version="4.4"
 docker push ghcr.io/ilbers/docker-isar:${version}
 ```
 
-- 
2.44.2

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240819161842.10367-4-ubely%40ilbers.de.

Re: [PATCH 0/3] Gitlab: update images used for CI

[Uladzimir Bely]

On Mon, 2024-08-19 at 19:15 +0300, Uladzimir Bely wrote:
> Switch to latest stable bookworm-based images for Gitlab CI.
> 
> This includes both `kas-isar` and `docker-isar` updates.
> 
> Uladzimir Bely (3):
>   docker-isar: Dockerfile: update avocado version to 103.0
>   docker-isar: Preinstall python3-apt package
>   gitlab-ci.yml: Use the latest stable kas-isar-4.4 based images.
> 
>  .gitlab-ci.yml                  | 4 ++--
>  testsuite/dockerdata/Dockerfile | 3 ++-
>  testsuite/dockerdata/README.md  | 4 ++--
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 
> -- 
> 2.44.2
> 

Applied to next.

-- 
Best regards,
Uladzimir.

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/6ce9f6c64fe375c623a1585cb12550c286e3d0b9.camel%40ilbers.de.