ci: switch from ubuntu:rolling to ubuntu:devel

The goal is to test with latest Ubuntu before a dracut release.

diff --git a/.github/workflows/container-extra.yml b/.github/workflows/container-extra.yml
index 0711797d360e3ed3a47f040bb737da86fce77e11..e5dbe6ecd02415b2dc419b1ecfa216e8e8d4cadc 100644 (file)
--- a/.github/workflows/container-extra.yml
+++ b/.github/workflows/container-extra.yml
@@ -36,7 +36,7 @@ jobs:
             matrix:
                 config:
                     - {dockerfile: 'Dockerfile-debian', tag: 'debian:sid', platform: 'linux/amd64'}
-                    - {dockerfile: 'Dockerfile-debian', tag: 'ubuntu:rolling', platform: 'linux/amd64'}
+                    - {dockerfile: 'Dockerfile-debian', tag: 'ubuntu:devel', platform: 'linux/amd64'}
                     - {dockerfile: 'Dockerfile-alpine', tag: 'alpine:edge', platform: 'linux/amd64'}
                     - {dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:latest', platform: 'linux/amd64', option: 'systemd'}
                     - {dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:amd64-openrc', platform: 'linux/amd64', option: 'amd64-openrc'}

diff --git a/.github/workflows/integration-extra.yml b/.github/workflows/integration-extra.yml
index bb37d62e68741ecfa44c7d30b78b15fd86be5641..a8284f132da4ce946a0e6359a0a4e4a9b383be47 100644 (file)
--- a/.github/workflows/integration-extra.yml
+++ b/.github/workflows/integration-extra.yml
@@ -37,7 +37,7 @@ jobs:
                     - gentoo:amd64-openrc
                     - opensuse
                     - ubuntu
-                    - ubuntu:rolling
+                    - ubuntu:devel
                     - void
                 test:
                     - "10"

diff --git a/.github/workflows/manualtest.yml b/.github/workflows/manualtest.yml
index a1d28bff8f40b56c9ec3d7eac65b3a07e3b0e82b..84029a66e0323b085b31632b7ed8acf1b4ffb529 100644 (file)
--- a/.github/workflows/manualtest.yml
+++ b/.github/workflows/manualtest.yml
@@ -22,7 +22,7 @@ on:  # yamllint disable-line rule:truthy
                     - "debian"
                     - "debian:sid"
                     - "ubuntu"
-                    - "ubuntu:rolling"
+                    - "ubuntu:devel"
                     - "opensuse"
                     - "gentoo"
                     - "void"

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index 6871eda70a51a31cf4f87392739d04f130eeb985..5ebb8c4c7a381c3b5ce2a864d36dd47dd9470c58 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -24,14 +24,14 @@ ENV V=2
 RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --no-install-recommends dracut
 
 # extra packages for sid, ubuntu
-RUN if [ "${DISTRIBUTION}" = "debian:sid" ] || [ "${DISTRIBUTION}" = "ubuntu:latest" ] ; then \
+RUN if [ "${DISTRIBUTION}" ! = "debian:latest" ] ; then \
     DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     network-manager \
     systemd-ukify \
     ; fi
 
-# extra packages for sid, rolling
-RUN if [ "$DISTRIBUTION" = "debian:sid" ] || [ "${DISTRIBUTION}" = "ubuntu:rolling" ] ; then \
+# extra packages for sid, rolling, devel
+RUN if [ "$DISTRIBUTION" = "debian:sid" ] || [ "${DISTRIBUTION}" = "ubuntu:rolling" ] || [ "${DISTRIBUTION}" = "ubuntu:devel" ] ; then \
     DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     systemd-cryptsetup \
     systemd-repart \