From 2f590deba3ea7ea332564f72e0c0fe7fc0f9056f Mon Sep 17 00:00:00 2001 From: soffokl Date: Mon, 29 Jan 2024 10:38:24 +0600 Subject: [PATCH] lunar is obsolete and will not accept new uploads. --- ci/release/debian.go | 2 +- ci/test/testinstall/Dockerfile.ubuntu-lunar | 34 ------------------- .../testinstall/install_integration_test.go | 1 - 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 ci/test/testinstall/Dockerfile.ubuntu-lunar diff --git a/ci/release/debian.go b/ci/release/debian.go index f07adc823e..0a3167b344 100644 --- a/ci/release/debian.go +++ b/ci/release/debian.go @@ -38,7 +38,7 @@ func releaseDebianPPA(opts *releaseDebianOpts) error { return err } - for _, codename := range []string{"bionic", "focal", "jammy", "lunar"} { + for _, codename := range []string{"bionic", "focal", "jammy"} { err := shell.NewCmdf("bin/release_ppa %s %s %s %s", opts.repository, opts.version, opts.buildNumber, codename).Run() if err != nil { return err diff --git a/ci/test/testinstall/Dockerfile.ubuntu-lunar b/ci/test/testinstall/Dockerfile.ubuntu-lunar deleted file mode 100644 index a3ff662b57..0000000000 --- a/ci/test/testinstall/Dockerfile.ubuntu-lunar +++ /dev/null @@ -1,34 +0,0 @@ -FROM ubuntu:23.04 - -ENV container docker -ENV LC_ALL C -ENV DEBIAN_FRONTEND noninteractive - -RUN apt update \ - && apt install -y systemd \ - && apt-get clean - -RUN cd /lib/systemd/system/sysinit.target.wants/ \ - && ls | grep -v systemd-tmpfiles-setup | xargs rm -f $1 - -RUN rm -f /lib/systemd/system/multi-user.target.wants/* \ - /etc/systemd/system/*.wants/* \ - /lib/systemd/system/local-fs.target.wants/* \ - /lib/systemd/system/sockets.target.wants/*udev* \ - /lib/systemd/system/sockets.target.wants/*initctl* \ - /lib/systemd/system/basic.target.wants/* \ - /lib/systemd/system/anaconda.target.wants/* \ - /lib/systemd/system/plymouth* \ - /lib/systemd/system/systemd-update-utmp* - -# https://github.com/moby/moby/issues/1297 -RUN echo resolvconf resolvconf/linkify-resolvconf boolean false | debconf-set-selections - -RUN apt update \ - && apt install -y \ - sudo \ - curl - -VOLUME ["/sys/fs/cgroup"] - -CMD ["/lib/systemd/systemd"] diff --git a/ci/test/testinstall/install_integration_test.go b/ci/test/testinstall/install_integration_test.go index bd7d660e11..9b58fbd272 100644 --- a/ci/test/testinstall/install_integration_test.go +++ b/ci/test/testinstall/install_integration_test.go @@ -49,7 +49,6 @@ func TestInstall(t *testing.T) { "ubuntu-focal", "ubuntu-impish", "ubuntu-jammy", - "ubuntu-lunar", } for _, img := range images { t.Run(img, func(t *testing.T) {