diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index afa95ea..44d55d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,6 @@ jobs: - fedora-37 - fedora-38 # - opensuse-42 # something is broken here - - ubuntu-18-04 - ubuntu-20-04 steps: - uses: actions/checkout@v3 @@ -93,7 +92,6 @@ jobs: - default-almalinux-9 - default-rockylinux-8 - default-rockylinux-9 - - default-ubuntu-18-04 - default-ubuntu-20-04 - default-debian-10 - default-debian-11 diff --git a/.kitchen.do.yml b/.kitchen.do.yml index 7c3939f..a5b84a7 100644 --- a/.kitchen.do.yml +++ b/.kitchen.do.yml @@ -47,12 +47,6 @@ platforms: lifecycle: post_create: - remote: sleep 10; while pgrep apt-get >/dev/null; do echo "Waiting for apt-get..."; sleep 5; done # let the installation of DO droplet-agent to finish and unlock dpkg -- name: ubuntu-18-04 - driver_config: - image: ubuntu-18-04-x64 - lifecycle: - post_create: - - remote: sleep 10; while pgrep apt-get >/dev/null; do echo "Waiting for apt-get..."; sleep 5; done # let the installation of DO droplet-agent to finish and unlock dpkg - name: ubuntu-20-04 driver_config: image: ubuntu-20-04-x64 diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml index 70ca854..5d5428b 100644 --- a/.kitchen.dokken.yml +++ b/.kitchen.dokken.yml @@ -92,12 +92,6 @@ platforms: driver: image: dokken/opensuse-leap pid_one_command: /bin/systemd -- name: ubuntu-18-04 - driver: - image: dokken/ubuntu-18.04 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - name: ubuntu-20-04 driver: image: dokken/ubuntu-20.04 diff --git a/.kitchen.yml b/.kitchen.yml index 178ee30..89b8149 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -3,9 +3,6 @@ driver: name: vagrant platforms: -- name: ubuntu-18-04 - driver_config: - box: bento/ubuntu-18.04 - name: ubuntu-20-04 driver_config: box: bento/ubuntu-20.04