From ebdc88622aa6a53f653d0b975d87f59311109a1d Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 8 Feb 2025 06:38:20 -0700 Subject: [PATCH] Test Alpine 3.18.11 (#1563) Update Alpine versions in README --- .github/dependabot.yml | 2 +- README.md | 8 ++++---- .../plugins/platformlabeler/PlatformDetailsTest.java | 2 +- .../plugins/platformlabeler/alpine/3.18.11/Dockerfile | 1 + .../platformlabeler/alpine/{3.18.9 => 3.18.11}/os-release | 2 +- .../plugins/platformlabeler/alpine/3.18.9/Dockerfile | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11/Dockerfile rename src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/{3.18.9 => 3.18.11}/os-release (89%) delete mode 100644 src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9/Dockerfile diff --git a/.github/dependabot.yml b/.github/dependabot.yml index dc6c06d1..9aafbab1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -42,7 +42,7 @@ updates: # Maintain dependencies for Alpine 3.18 - package-ecosystem: "docker" - directory: "src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9" + directory: "src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11" ignore: - dependency-name: "Dockerfile" update-types: ["version-update:semver-patch"] diff --git a/README.md b/README.md index ab925a9f..17ef8a8e 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ Labels commonly include operating system name, version, architecture, and Window | -------------------------- | ------------------ | -------------- | ------------ | | Alma Linux 8 | `AlmaLinux` | `8.10` | `amd64` | // EOL: 31 Mar 2029 | Alma Linux 9 | `AlmaLinux` | `9.5` | `amd64` | // EOL: 31 May 2032 -| Alpine 3.18 | `Alpine` | `3.18.9` | `amd64` | // EOL: 01 May 2025 -| Alpine 3.19 | `Alpine` | `3.19.4` | `amd64` | // EOL: 01 Nov 2025 -| Alpine 3.20 | `Alpine` | `3.20.3` | `amd64` | // EOL: 01 May 2026 -| Alpine 3.21 | `Alpine` | `3.21.0` | `amd64` | // EOL: 01 Nov 2026 +| Alpine 3.18 | `Alpine` | `3.18.11` | `amd64` | // EOL: 01 May 2025 +| Alpine 3.19 | `Alpine` | `3.19.6` | `amd64` | // EOL: 01 Nov 2025 +| Alpine 3.20 | `Alpine` | `3.20.5` | `amd64` | // EOL: 01 May 2026 +| Alpine 3.21 | `Alpine` | `3.21.2` | `amd64` | // EOL: 01 Nov 2026 | Amazon Linux 2023 | `Amazon` | `2023` | `amd64` | // EOL: 15 Mar 2028 | Debian 11 | `Debian` | `11` | `amd64` | // EOL: 30 Jun 2026 | Debian 12 | `Debian` | `12` | `amd64` | // EOL: 30 Jun 2028 diff --git a/src/test/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTest.java b/src/test/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTest.java index 0a6cabfc..4f150e7f 100644 --- a/src/test/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTest.java +++ b/src/test/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTest.java @@ -159,7 +159,7 @@ void testDetailsWithoutOsName() { private final String[] versions = { "3.17.9", - "3.18.8", + "3.18.11", "3.19.3", "3.20.2", "3.21.0", diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11/Dockerfile b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11/Dockerfile new file mode 100644 index 00000000..9ad8e0b0 --- /dev/null +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11/Dockerfile @@ -0,0 +1 @@ +FROM alpine:3.18.11 diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9/os-release b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11/os-release similarity index 89% rename from src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9/os-release rename to src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11/os-release index 6dd7e71b..0b7c6301 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9/os-release +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.11/os-release @@ -1,6 +1,6 @@ NAME="Alpine Linux" ID=alpine -VERSION_ID=3.18.9 +VERSION_ID=3.18.11 PRETTY_NAME="Alpine Linux v3.18" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9/Dockerfile b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9/Dockerfile deleted file mode 100644 index 4e610498..00000000 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/alpine/3.18.9/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM alpine:3.18.9